diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
index 808422d8568..4ff39aa74fe 100644
--- a/.github/workflows/build-image-beta.yml
+++ b/.github/workflows/build-image-beta.yml
@@ -24,7 +24,4 @@ jobs:
     secrets: inherit
     with:
       fedora_version: beta
-    strategy:
-      matrix:
-        image_flavor: [main, nvidia]
 
diff --git a/.github/workflows/build-image-gts.yml b/.github/workflows/build-image-gts.yml
index d0f9122ca7f..2f9168ccd60 100644
--- a/.github/workflows/build-image-gts.yml
+++ b/.github/workflows/build-image-gts.yml
@@ -18,7 +18,4 @@ jobs:
     secrets: inherit
     with:
       fedora_version: gts
-    strategy:
-      matrix:
-        image_flavor: [main, nvidia]
 
diff --git a/.github/workflows/build-image-latest.yml b/.github/workflows/build-image-latest.yml
index 1e8035924f6..099bd2c6aea 100644
--- a/.github/workflows/build-image-latest.yml
+++ b/.github/workflows/build-image-latest.yml
@@ -24,6 +24,3 @@ jobs:
     secrets: inherit
     with:
       fedora_version: latest
-    strategy:
-      matrix:
-        image_flavor: [main, nvidia, hwe, hwe-nvidia]
diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml
index b76cabf93cd..aa090078d97 100644
--- a/.github/workflows/build-image-stable.yml
+++ b/.github/workflows/build-image-stable.yml
@@ -18,6 +18,4 @@ jobs:
     secrets: inherit
     with:
       fedora_version: stable
-    strategy:
-      matrix:
-        image_flavor: [main, nvidia]
+
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 1238cbf3f20..1e177d56ed1 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -11,24 +11,12 @@ jobs:
     build-image-gts:
         uses: ./.github/workflows/build-image-gts.yml
         secrets: inherit
-        strategy:
-            matrix:
-                base_name: [bluefin, bluefin-dx]
     build-image-stable:
         uses: ./.github/workflows/build-image-stable.yml
         secrets: inherit
-        strategy:
-            matrix:
-                base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     build-image-latest:
         uses: ./.github/workflows/build-image-latest.yml
         secrets: inherit
-        strategy:
-            matrix:
-                base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     build-image-beta:
         uses: ./.github/workflows/build-image-beta.yml
-        secrets: inherit
-        strategy:
-            matrix:
-                base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
\ No newline at end of file
+        secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index bc47caef2ea..6c8a0f11ece 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -24,38 +24,38 @@ jobs:
     continue-on-error: false
     outputs:
       image_full: ${{ steps.generate-outputs.outputs.image }}
-    # strategy:
-    #   fail-fast: false
-    #   matrix:
-    #     image_flavor:
-    #       - main
-    #       - nvidia
-    #       - hwe
-    #       - hwe-nvidia
-    #     base_name:
-    #       - bluefin
-    #       - bluefin-dx
-    #       - aurora
-    #       - aurora-dx
-    #     fedora_version:
-    #       - ${{ inputs.fedora_version }}
-    #     exclude:
-    #       - fedora_version: gts
-    #         base_name: aurora
-    #       - fedora_version: gts
-    #         base_name: aurora-dx
-    #       - fedora_version: gts
-    #         image_flavor: hwe
-    #       - fedora_version: gts
-    #         image_flavor: hwe-nvidia
-    #       - fedora_version: stable
-    #         image_flavor: hwe
-    #       - fedora_version: stable
-    #         image_flavor: hwe-nvidia
-    #       - fedora_version: beta
-    #         image_flavor: hwe
-    #       - fedora_version: beta
-    #         image_flavor: hwe-nvidia
+    strategy:
+      fail-fast: false
+      matrix:
+        image_flavor:
+          - main
+          - nvidia
+          - hwe
+          - hwe-nvidia
+        base_name:
+          - bluefin
+          - bluefin-dx
+          - aurora
+          - aurora-dx
+        fedora_version:
+          - ${{ inputs.fedora_version }}
+        exclude:
+          - fedora_version: gts
+            base_name: aurora
+          - fedora_version: gts
+            base_name: aurora-dx
+          - fedora_version: gts
+            image_flavor: hwe
+          - fedora_version: gts
+            image_flavor: hwe-nvidia
+          - fedora_version: stable
+            image_flavor: hwe
+          - fedora_version: stable
+            image_flavor: hwe-nvidia
+          - fedora_version: beta
+            image_flavor: hwe
+          - fedora_version: beta
+            image_flavor: hwe-nvidia
 
     steps:
       - name: Checkout