diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6505a74..f003270 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,9 +51,6 @@ base-images:
       when: always
     # All other cases: do not run
     - when: never
-  variables:
-    BB_BUILD_PUSH: 'true'
-    BB_BUILD_RECHUNK: 'true'
   parallel:
     matrix:
       - RECIPE:
@@ -65,6 +62,8 @@ base-images:
           - base-combo-nvidia.yml
           - base-kinoite.yml
           - base-kinoite-nvidia.yml
+        BB_BUILD_PUSH: 'true'
+        BB_BUILD_RECHUNK: 'true'
 
 legacy-build-images:
   extends:
@@ -83,30 +82,13 @@ build-images:
   extends:
     - .build
   stage: build
-  variables:
-    TAG: 340-feat-multiarch
-    BB_BUILD_PUSH: 'true'
+  needs:
+    - job: base-images
+      optional: true
   parallel:
     matrix:
       - RECIPE:
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
-
-'build-images: [jp-desktop-nvidia.yml]':
-  extends:
-    - build-images
-  needs:
-    - job: base-images
-      parallel:
-        matrix:
-          - RECIPE: base-combo-nvidia.yml
-        
-
-'build-images: [jp-laptop.yml]':
-  extends:
-    - build-images
-  needs:
-    - job: base-images
-      parallel:
-        matrix:
-          - RECIPE: base-combo.yml
+        BB_BUILD_PUSH: 'true'
+        TAG: 340-feat-multiarch