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