diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f003270..e0b4418 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,9 @@ base-images:
   extends:
     - .build
   stage: base-images
+  variables:
+    BB_BUILD_PUSH: 'true'
+    BB_BUILD_RECHUNK: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:
@@ -62,33 +65,33 @@ 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:
     - .build
   stage: build
+  variables:
+    BB_BUILD_PUSH: 'true'
   needs: []
   parallel:
     matrix:
       - RECIPE:
-          - cp-laptop.yml
           - wke-server.yml
           - wke-worker.yml
-        BB_BUILD_PUSH: 'true'
 
 build-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_PUSH: 'true'
+    TAG: 340-feat-multiarch
   needs:
     - job: base-images
       optional: true
   parallel:
     matrix:
       - RECIPE:
+          - cp-laptop.yml
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
-        BB_BUILD_PUSH: 'true'
-        TAG: 340-feat-multiarch