diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 542f2fb..de29e2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ stages:
 build-image:
   stage: build
   interruptible: true
-  # image: ghcr.io/blue-build/cli:rechunk
-  image: ghcr.io/blue-build/cli:main
+  image: ghcr.io/blue-build/cli:fresh-rechunk
+  # image: ghcr.io/blue-build/cli:main
   services:
     - docker:dind
   parallel:
@@ -23,8 +23,10 @@ build-image:
       - RECIPE:
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
-        OPTS:
-          - "--rechunk"
+        BB_BUILD_RECHUNK:
+          - "true"
+        BB_BUILD_RECHUNK_CLEAR_PLAN:
+          - "true"
       - RECIPE:
           - cp-laptop.yml
           - jp-truenas.yml
@@ -40,4 +42,4 @@ build-image:
     - export COSIGN_PRIVATE_KEY=$(cat .secure_files/cosign.key)
   script:
     - sleep 5
-    - bluebuild build -vv $OPTS -S sigstore -p ./recipes/$RECIPE
+    - bluebuild build -vv -S sigstore -p ./recipes/$RECIPE