diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5849d4..15c1bc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ build-image:
           - jp-laptop.yml
       - RECIPE:
           - jp-desktop-nvidia-bootc.yml
+          - jp-laptop-bootc.yml
         BB_BUILD_RECHUNK: "true"
   variables:
     DOCKER_HOST: tcp://docker:2376
diff --git a/recipes/common/bootc-setup.yml b/recipes/common/bootc-setup.yml
new file mode 100644
index 0000000..aad8377
--- /dev/null
+++ b/recipes/common/bootc-setup.yml
@@ -0,0 +1,10 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+modules:
+  - type: dnf
+    source: ghcr.io/blue-build/modules/dnf:dnf-module 
+    install:
+      packages:
+        - https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-%OS_VERSION%.noarch.rpm
+        - https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-%OS_VERSION%.noarch.rpm
+        - dnf5-plugins
diff --git a/recipes/common/gaming-bootc.yml b/recipes/common/gaming-bootc.yml
index 76c9de8..578e04c 100644
--- a/recipes/common/gaming-bootc.yml
+++ b/recipes/common/gaming-bootc.yml
@@ -5,15 +5,7 @@ modules:
     files:
       - source: steam-firewall
         destination: /
-  # - type: bling
-  #   source: ghcr.io/blue-build/modules/bling:343-featbling-add-rpmfusion-install-script
-  #   install:
-  #     - negativo17
-  # - type: script
-  #   scripts:
-  #     - install-steam.sh
   - type: dnf
-    # source: local
     source: ghcr.io/blue-build/modules/dnf:dnf-module 
     optfix:
       - r2modman
diff --git a/recipes/common/jp-desktop-bootc.yml b/recipes/common/jp-desktop-bootc.yml
index e3368bf..65fb866 100644
--- a/recipes/common/jp-desktop-bootc.yml
+++ b/recipes/common/jp-desktop-bootc.yml
@@ -1,16 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
+  - from-file: common/bootc-setup.yml
   - type: dnf
-    # source: local
-    source: ghcr.io/blue-build/modules/dnf:dnf-module 
-    install:
-      packages:
-        - https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-%OS_VERSION%.noarch.rpm
-        - https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-%OS_VERSION%.noarch.rpm
-        - dnf5-plugins
-  - type: dnf
-    # source: local
     source: ghcr.io/blue-build/modules/dnf:dnf-module 
     copr:
       - ryanabx/cosmic-epoch
diff --git a/recipes/common/jp-laptop-bootc.yml b/recipes/common/jp-laptop-bootc.yml
new file mode 100644
index 0000000..a9d49d1
--- /dev/null
+++ b/recipes/common/jp-laptop-bootc.yml
@@ -0,0 +1,14 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+modules:
+  - from-file: common/bootc-setup.yml
+  - type: dnf
+    source: ghcr.io/blue-build/modules/dnf:dnf-module 
+    copr:
+      - ryanabx/cosmic-epoch
+    install:
+      packages:
+        - cosmic-desktop
+        - fprintd
+        - fprintd-pam
+  - from-file: common/jp-common-bootc.yml
diff --git a/recipes/jp-laptop-bootc.yml b/recipes/jp-laptop-bootc.yml
new file mode 100644
index 0000000..d215d44
--- /dev/null
+++ b/recipes/jp-laptop-bootc.yml
@@ -0,0 +1,14 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+name: jp-laptop
+base-image: quay.io/fedora/fedora-kinoite
+image-version: 41
+alt-tags:
+  - bootc
+description: The image of Wunker OS for JP's Laptop.
+stages:
+  - from-file: common/helix.yml
+modules:
+  - from-file: common/jp-laptop-bootc.yml
+  - from-file: common/helix.yml
+  - from-file: common/post-build.yml