diff --git a/config/scripts/install-helix.sh b/config/scripts/install-helix.sh
index b0fd442..fadfc6d 100644
--- a/config/scripts/install-helix.sh
+++ b/config/scripts/install-helix.sh
@@ -15,3 +15,4 @@ cargo install --path helix-term --locked
 
 mkdir -p /out/
 mv $CARGO_HOME/bin/hx /out/hx
+mv runtime /out/
diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml
index 0dcdd04..2ea917f 100644
--- a/recipes/common/dev-packages.yml
+++ b/recipes/common/dev-packages.yml
@@ -14,8 +14,6 @@ modules:
       - earthly
       - kubectl
       - helm
-      - neovim
-      - helix
       # - openssl1.1
       - parallel
       - gcc-aarch64-linux-gnu
diff --git a/recipes/common/helix.yml b/recipes/common/helix.yml
index 3e80118..3830f4d 100644
--- a/recipes/common/helix.yml
+++ b/recipes/common/helix.yml
@@ -10,3 +10,10 @@ modules:
     from: helix
     src: /out/hx
     dest: /usr/bin/
+  - type: copy
+    from: helix
+    src: /out/runtime
+    dest: /usr/lib64/helix/
+  - type: script
+    snippets:
+      - hx -g fetch && hx -g build
diff --git a/recipes/jp-desktop-39.yml b/recipes/jp-desktop-39.yml
index 5b16a50..cdea56f 100644
--- a/recipes/jp-desktop-39.yml
+++ b/recipes/jp-desktop-39.yml
@@ -5,5 +5,8 @@ alt-tags:
   - gts
   - stable
 description: The image of Wunker OS for JP's desktop gaming.
+stages:
+  - from-file: common/helix.yml
 modules:
   - from-file: common/jp-desktop.yml
+  - from-file: common/helix.yml
diff --git a/recipes/jp-desktop.yml b/recipes/jp-desktop.yml
index 3a64a1b..746b35f 100644
--- a/recipes/jp-desktop.yml
+++ b/recipes/jp-desktop.yml
@@ -3,9 +3,7 @@ base-image: ghcr.io/ublue-os/bazzite-nvidia
 image-version: 40
 description: The image of Wunker OS for JP's desktop gaming.
 stages:
-  - from-file: common/bluebuild.yml
   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-desktop.yml
-  - from-file: common/bluebuild.yml
   - from-file: common/helix.yml
diff --git a/recipes/jp-laptop-39.yml b/recipes/jp-laptop-39.yml
index 1ca002e..6b1fbff 100644
--- a/recipes/jp-laptop-39.yml
+++ b/recipes/jp-laptop-39.yml
@@ -5,5 +5,8 @@ alt-tags:
   - gts
   - stable
 description: The image of Wunker OS for JP's Laptop.
+stages:
+  - from-file: common/helix.yml
 modules:
   - from-file: common/jp-laptop.yml
+  - from-file: common/helix.yml
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index 9dedf12..688ed44 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -2,5 +2,8 @@ name: jp-laptop
 base-image: ghcr.io/ublue-os/bazzite
 image-version: 40
 description: The image of Wunker OS for JP's Laptop.
+stages:
+  - from-file: common/helix.yml
 modules:
   - from-file: common/jp-laptop.yml
+  - from-file: common/helix.yml