diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d76a2e7..0d1c538 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ variables:
   BB_SIGNING_DRIVER: sigstore
   BB_BUILD_PUSH: 'true'
   BB_BUILD_CHUNKED_OCI: 'true'
+  BB_RECHUNK_CLEAR_PLAN: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml
index 23ddb64..9b1069d 100644
--- a/recipes/common/dev-packages.yml
+++ b/recipes/common/dev-packages.yml
@@ -49,7 +49,7 @@ modules:
         - patch
         - rpmdevtools
         - protobuf-compiler
-        # - helix
+        - helix
         - tofu
         - terraform
         - terraform-ls
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 3e86d98..a421260 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -6,9 +6,9 @@ image-version: latest
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none
 nushell-version: none
-stages:
-  - from-file: common/helix.yml
-  - from-file: common/spyro2-rando-client.yaml
+# stages:
+#   - from-file: common/helix.yml
+#   - from-file: common/spyro2-rando-client.yaml
   # - name: cosmic-comp
   #   from: rust
   #   modules:
@@ -20,8 +20,8 @@ stages:
   #       ref: 605bb63a4de640b77f6d3017238ece48cb286933 # supposed fix
 modules:
   - from-file: common/jp-desktop.yml
-  - from-file: common/helix.yml
-  - from-file: common/spyro2-rando-client.yaml
+  # - from-file: common/helix.yml
+  # - from-file: common/spyro2-rando-client.yaml
   # - type: copy
   #   from: cosmic-comp
   #   src: /out/cosmic-comp
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index 6423d9a..fdd2801 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -4,9 +4,9 @@ name: jp-laptop
 base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo
 image-version: latest
 description: The image of Wunker OS for JP's Laptop.
-stages:
-  - from-file: common/helix.yml
+# stages:
+#   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-laptop.yml
-  - from-file: common/helix.yml
+  # - from-file: common/helix.yml
   - from-file: common/post-build.yml