diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b80264..6eb4018 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ build-image:
     matrix:
       - RECIPE:
           - cp-laptop.yml
-          - jp-laptop.yml
+          - jp-desktop-nvidia.yml
           - wke-server.yml
           - wke-worker.yml
         TAG:
@@ -29,7 +29,7 @@ build-image:
         DRIVER:
           - docker
       - RECIPE:
-          - jp-desktop-nvidia.yml
+          - jp-laptop.yml
         TAG:
           - 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci
         DRIVER:
diff --git a/recipes/common/cosmic.yml b/recipes/common/cosmic.yml
index 389e011..95fdd17 100644
--- a/recipes/common/cosmic.yml
+++ b/recipes/common/cosmic.yml
@@ -1,8 +1,22 @@
 modules:
+  # Latest build
   - type: dnf
     repos:
+      cleanup: true
       copr:
         - ryanabx/cosmic-epoch
     install:
       packages:
         - cosmic-desktop
+
+  # Official release
+  # - type: dnf
+  #   group-install:
+  #     packages:
+  #       - cosmic-desktop-environment
+
+  # Setup cosmic greeter as DM
+  # - type: systemd
+  #   system:
+  #     enabled:
+  #       - cosmic-greeter
diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml
index b2c9c9d..e7e64f9 100644
--- a/recipes/common/jp-common.yml
+++ b/recipes/common/jp-common.yml
@@ -2,6 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
   - from-file: common/common.yml
+  - from-file: common/cosmic.yml
   - from-file: common/pipewire-tweaks.yml
   - from-file: common/jp-packages.yml
   - from-file: common/gaming.yml
diff --git a/recipes/common/jp-desktop.yml b/recipes/common/jp-desktop.yml
index e2e498e..8b8b5b1 100644
--- a/recipes/common/jp-desktop.yml
+++ b/recipes/common/jp-desktop.yml
@@ -1,20 +1,6 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
-  - type: dnf
-    # repos:
-    #   cleanup: true
-    #   nonfree: negativo17
-    group-install:
-      packages:
-        - cosmic-desktop-environment
-  #   install:
-  #     packages:
-  #       - steam
-  # - type: systemd
-  #   system:
-  #     enabled:
-  #       - cosmic-greeter
   - type: files
     files:
       - source: desktop-audio
diff --git a/recipes/common/jp-laptop.yml b/recipes/common/jp-laptop.yml
index f31cee1..481dc28 100644
--- a/recipes/common/jp-laptop.yml
+++ b/recipes/common/jp-laptop.yml
@@ -3,13 +3,6 @@
 modules:
   # - from-file: common/bootc-setup.yml
   - type: dnf
-    # repos:
-    #   cleanup: true
-    #   copr:
-    #     - ryanabx/cosmic-epoch
-    group-install:
-      packages:
-        - cosmic-desktop-environment
     install:
       packages:
         # - cosmic-desktop
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 3a1ed78..d62ae9c 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -26,7 +26,6 @@ modules:
       ID: wunker_os
       PRETTY_NAME: Wunker OS for Nvidia
   - from-file: common/jp-desktop.yml
-  # - from-file: common/cosmic.yml
   - from-file: common/helix.yml
   # - type: copy
   #   from: cosmic-comp
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index 1d9a26a..dd2a08f 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -14,6 +14,5 @@ modules:
       ID: wunker_os
       PRETTY_NAME: Wunker OS for Framework 16
   - from-file: common/jp-laptop.yml
-  - from-file: common/cosmic.yml
   - from-file: common/helix.yml
   - from-file: common/post-build.yml