diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index a2cb413..d09baf7 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -143,7 +143,7 @@ jobs:
         id: upload
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.build.outputs.iso_name }}
+          name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}
           path: |
             build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
             build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso-CHECKSUM
diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index 3d42905..f64ab04 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -86,11 +86,11 @@ jobs:
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs[format('iso_name-{0}', matrix.version)] }}
+          name: ${{ inputs[format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}
 
       - name: Add Kickstart and Grub options to ISO
         run: |
-          make test/vm/files/install.iso ISO_NAME=${{ inputs[format('iso_name-{0}', matrix.version)] }}
+          make test/vm/files/install.iso ISO_NAME=${{ inputs[format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}.iso
 
       - name: Create VM disk
         run: |
diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index 68719bd..6d241f8 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -85,7 +85,7 @@ jobs:
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs[format('iso_name-{0}', matrix.version)] }}
+          name: ${{ inputs[format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}
 
       - name: Run ISO checks
         run: |
@@ -99,7 +99,7 @@ jobs:
             FLATPAK_REMOTE_REFS_DIR=${{ needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR }} \
             SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
             ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} \
-            ISO_NAME=${{ inputs[format('iso_name-{0}', matrix.version)] }}
+            ISO_NAME=${{ inputs[format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}.iso
 
       - name: Set status
         if: inputs.pr && always()