diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index d09baf7..a463c97 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -10,16 +10,6 @@ on:
       flatpaks_refs_dir:
         required: false
         type: string
-    outputs:
-      iso_name-38:
-        description: "Version 38 ISO Name"
-        value: ${{ jobs.build_iso.outputs.iso_name-38 }}
-      iso_name-39:
-        description: "Version 39 ISO Name"
-        value: ${{ jobs.build_iso.outputs.iso_name-39 }}
-      iso_name-40:
-        description: "Version 40 ISO Name"
-        value: ${{ jobs.build_iso.outputs.iso_name-40 }}
 
 jobs:
   load_vars:
@@ -41,14 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - 38
-          - 39
-          - 40
-    outputs:
-      iso_name-38: ${{ steps.save_output.outputs.iso_name-38 }}
-      iso_name-39: ${{ steps.save_output.outputs.iso_name-39 }}
-      iso_name-40: ${{ steps.save_output.outputs.iso_name-40 }}
+        version: ${{ needs.load_vars.outputs.BUILD_VERSIONS }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 3ec77e8..d06ab14 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -3,6 +3,8 @@ on:
     outputs:
       ARCH:
         value: 'x86_64'
+      BUILD_VERSIONS:
+        value: '[38, 39, 40]'
       IMAGE_NAME:
         value: 'base'
       IMAGE_REPO:
diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index f64ab04..284694b 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -7,17 +7,6 @@ on:
       parent_job_name:
         required: true
         type: string
-      iso_name-38:
-        required: true
-        type: string
-      iso_name-39:
-        required: true
-        type: string
-      iso_name-40:
-        required: true
-        type: string
-
-
 
 jobs:
   load_vars:
@@ -38,10 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - 38
-          - 39
-          - 40
+        version: ${{ needs.load_vars.outputs.BUILD_VERSIONS }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -86,11 +72,11 @@ jobs:
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs[format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}
+          name: ${{ 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('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}.iso
+          make test/vm/files/install.iso ISO_NAME=${{ 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 6d241f8..81d0fdc 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -6,17 +6,7 @@ on:
         type: string
       parent_job_name:
         required: true
-        type: string
-      iso_name-38:
-        required: true
-        type: string
-      iso_name-39:
-        required: true
-        type: string
-      iso_name-40:
-        required: true
-        type: string
-      
+        type: string      
 
 jobs:
   load_vars:
@@ -37,10 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - 38
-          - 39
-          - 40
+        version: ${{ needs.load_vars.outputs.BUILD_VERSIONS }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -85,7 +72,7 @@ jobs:
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs[format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}
+          name: ${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}
 
       - name: Run ISO checks
         run: |
@@ -99,7 +86,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('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version)] }}.iso
+            ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}.iso
 
       - name: Set status
         if: inputs.pr && always()