diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bce91f..8f05723 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,8 @@ base-images:
   extends:
     - .build
   stage: base-images
+  variables:
+    BB_BUILD_RECHUNK: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:
@@ -63,11 +65,11 @@ base-images:
           # - base-cosmic-nvidia.yml
           - base-kinoite.yml
           - base-kinoite-nvidia.yml
-        BB_BUILD_RECHUNK: 'true'
       - RECIPE:
           - base-combo.yml
           - base-combo-nvidia.yml
         BB_BUILD_CHUNKED_OCI: 'true'
+        BB_BUILD_RECHUNK: 'false'
 
 wke-images:
   extends:
@@ -115,7 +117,7 @@ combo-images:
   variables:
     BB_BUILD_CHUNKED_OCI: 'true'
   needs:
-    - job: 'base-images: [base-combo.yml]'
+    - job: 'base-images: [base-combo.yml, true, false]'
       optional: true
   parallel:
     matrix:
@@ -129,7 +131,7 @@ combo-nvidia-images:
   variables:
     BB_BUILD_CHUNKED_OCI: 'true'
   needs:
-    - job: 'base-images: [base-combo-nvidia.yml]'
+    - job: 'base-images: [base-combo-nvidia.yml, true, false]'
       optional: true
   parallel:
     matrix: