diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 16edbfa..ad1a839 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -68,7 +68,8 @@ jobs:
           - 38
           - 39
     outputs:
-      iso_name: ${{ steps.build.outputs.iso_name }}
+      iso_name-38: ${{ steps.save_output.outputs.iso_name-38 }}
+      iso_name-39: ${{ steps.save_output.outputs.iso_name-39 }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -101,6 +102,12 @@ jobs:
           enrollment_password: ${{ env.ENROLLMENT_PASSWORD }}
           iso_name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
 
+      - name: Save output
+        id: save_output
+        shell: bash
+        run: |
+          echo "iso_name-${{ matrix.version }}=${{ steps.build.outputs.iso_name}}" >> $GITHUB_OUTPUT
+
       - name: Upload ISO as artifact
         id: upload
         uses: actions/upload-artifact@v4
@@ -142,16 +149,16 @@ jobs:
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ needs.build-and-push-iso.outputs.iso_name }}
+          name: ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}
     
       - name: Verify ISO
         run: |
-          checkisomd5 ${{ needs.build-and-push-iso.outputs.iso_name }}
-          sha256sum -c ${{ needs.build-and-push-iso.outputs.iso_name }}-CHECKSUM
+          checkisomd5 ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}
+          sha256sum -c ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}-CHECKSUM
 
       - name: Run ISO checks
         run: |
-          mv ${{ needs.build-and-push-iso.outputs.iso_name }} deploy.iso
+          mv ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }} deploy.iso
           make test-iso VERSION=${{ matrix.version }}
 
       - name: Add Kickstart and Grub options to ISO