diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79ec8d3..946ff53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,14 +21,20 @@ build-image:
     matrix:
       - RECIPE:
           - cp-laptop.yml
-          # - jp-desktop-nvidia.yml
+          - jp-desktop-nvidia.yml
           - wke-server.yml
           - wke-worker.yml
           - jp-laptop.yml
         TAG: main
-      - RECIPE: jp-desktop-nvidia.yml
+        BB_CACHE_LAYERS: 'true'
+        BB_BUILD_PUSH: 'true'
+      - RECIPE: wke-server.yml
         TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci
-        BB_BUILD_RECHUNK: 'true'
+        BB_BUILD_DRIVER: podman
+        BB_BUILD_SQUASH: 'true'
+        BB_BUILD_RECHUNK:
+          - 'true'
+          - 'false'
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
@@ -36,8 +42,6 @@ build-image:
     DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
     RUST_LOG_STYLE: always
     BB_SIGNING_DRIVER: sigstore
-    BB_CACHE_LAYERS: 'true'
-    BB_BUILD_PUSH: 'true'
     CLICOLOR_FORCE: 1
   before_script:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash