diff --git a/files/scripts/install-cosmic-comp.sh b/files/scripts/install-cosmic-comp.sh
deleted file mode 100644
index 109df56..0000000
--- a/files/scripts/install-cosmic-comp.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-apt-get update && apt-get install -y git libudev-dev libseat-dev libxkbcommon-dev libinput-dev libgbm-dev
-
-mkdir -p /src/
-cd /src/
-
-git clone https://github.com/pop-os/cosmic-comp.git
-cd cosmic-comp
-
-make vendor
-make all DEBUG=1 VENDOR=1
-
-mkdir -p /out/
-mv target/debug/cosmic-comp /out/cosmic-comp
diff --git a/recipes/common/cosmic-comp.yml b/recipes/common/cosmic-comp.yml
deleted file mode 100644
index 0d7bb49..0000000
--- a/recipes/common/cosmic-comp.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-stage-list-v1.json
-stages:
-  - name: cosmic-comp
-    from: rust
-    modules:
-      - type: cosmic
-        source: local
-        component: cosmic-comp
-        ref: bebd7c5c40c038470d2eef0501a3efb34f2df966
-        # ref: db13eea91c15ca57d76454432d1fb9c09c51ba8c
-modules:
-  - type: copy
-    from: cosmic-comp
-    src: /out/cosmic-comp
-    dest: /usr/bin/cosmic-comp
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 7ff9d1a..d5c0b2f 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -7,10 +7,20 @@ image-version: stable
 description: The image of Wunker OS for JP's desktop gaming.
 stages:
   - from-file: common/helix.yml
-  - from-file: common/cosmic-comp.yml
+  - name: cosmic-comp
+    from: rust
+    modules:
+      - type: cosmic
+        source: local
+        component: cosmic-comp
+        # ref: bebd7c5c40c038470d2eef0501a3efb34f2df966 # Known bug commit
+        ref: db13eea91c15ca57d76454432d1fb9c09c51ba8c # Last known working commit
 modules:
   - from-file: common/jp-desktop.yml
   - from-file: common/cosmic.yml
   - from-file: common/helix.yml
-  - from-file: common/cosmic-comp.yml
+  - type: copy
+    from: cosmic-comp
+    src: /out/cosmic-comp
+    dest: /usr/bin/cosmic-comp
   - from-file: common/post-build.yml
diff --git a/recipes/jp-laptop-bootc.yml b/recipes/jp-laptop-bootc.yml
index b108a1b..e653454 100644
--- a/recipes/jp-laptop-bootc.yml
+++ b/recipes/jp-laptop-bootc.yml
@@ -8,9 +8,18 @@ alt-tags:
 description: The image of Wunker OS for JP's Laptop.
 stages:
   - from-file: common/helix.yml
-  # - from-file: common/cosmic-comp.yml
+  - name: cosmic-comp
+    from: rust
+    modules:
+      - type: cosmic
+        source: local
+        component: cosmic-comp
+        debug: true
 modules:
   - from-file: common/jp-laptop-bootc.yml
   - from-file: common/helix.yml
-  # - from-file: common/cosmic-comp.yml
+  - type: copy
+    from: cosmic-comp
+    src: /out/cosmic-comp
+    dest: /usr/bin/cosmic-comp
   - from-file: common/post-build.yml