diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83cd208..1de807d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,6 @@ variables:
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
   BB_BUILD_PUSH: 'true'
-  BB_BUILD_CHUNKED_OCI: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
@@ -45,6 +44,7 @@ base-images:
   stage: base-images
   variables:
     BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '64'
+    BB_BUILD_CHUNKED_OCI: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:
@@ -99,8 +99,6 @@ kinoite-nvidia-images:
   extends:
     - .build
   stage: build
-  variables:
-    BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
   needs:
     - job: 'base-images: [base-kinoite-nvidia.yml]'
       optional: true