diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c48ab5..8ad6a34 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,6 +45,8 @@ jobs:
           - general/recipe-wayblue-river-nvidia.yml
           - general/recipe-wayblue-sway-main.yml
           - general/recipe-wayblue-sway-nvidia.yml
+          - general/recipe-cosmic-main.yml
+          - general/recipe-cosmic-nvidia.yml
           # asus
           - asus/recipe-silverblue-asus.yml
           - asus/recipe-silverblue-asus-nvidia.yml
@@ -87,6 +89,8 @@ jobs:
           - general/recipe-wayblue-river-nvidia-userns.yml
           - general/recipe-wayblue-sway-main-userns.yml
           - general/recipe-wayblue-sway-nvidia-userns.yml
+          - general/recipe-cosmic-main-userns.yml
+          - general/recipe-cosmic-nvidia-userns.yml
           # asus
           - asus/recipe-silverblue-asus-userns.yml
           - asus/recipe-silverblue-asus-nvidia-userns.yml
diff --git a/recipes/general/recipe-cosmic-main-userns.yml b/recipes/general/recipe-cosmic-main-userns.yml
new file mode 100644
index 0000000..5078b87
--- /dev/null
+++ b/recipes/general/recipe-cosmic-main-userns.yml
@@ -0,0 +1,18 @@
+name: cosmic-main-userns-hardened
+
+description: "Cosmic main with some hardening applied"
+
+base-image: ghcr.io/ublue-os/cosmic-base
+
+image-version: 40
+
+modules:
+  - from-file: common/initialization-scripts.yml
+  - from-file: common/gui-packages.yml
+  - from-file: common/common-packages.yml
+  - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/remove-firefox.yml
+  - type: secureblue-signing
+  - type: yafti 
diff --git a/recipes/general/recipe-cosmic-main.yml b/recipes/general/recipe-cosmic-main.yml
new file mode 100644
index 0000000..36002a8
--- /dev/null
+++ b/recipes/general/recipe-cosmic-main.yml
@@ -0,0 +1,20 @@
+name: cosmic-main-hardened
+
+description: "Cosmic main with some hardening applied"
+
+base-image: ghcr.io/ublue-os/cosmic-base
+
+image-version: 40
+
+modules:
+  - from-file: common/initialization-scripts.yml
+  - from-file: common/gui-packages.yml
+  - from-file: common/common-packages.yml
+  - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/remove-firefox.yml
+  - from-file: common/disableuserns-packages.yml
+  - from-file: common/disableuserns-scripts.yml
+  - type: secureblue-signing
+  - type: yafti 
diff --git a/recipes/general/recipe-cosmic-nvidia-userns.yml b/recipes/general/recipe-cosmic-nvidia-userns.yml
new file mode 100644
index 0000000..dc8eaf4
--- /dev/null
+++ b/recipes/general/recipe-cosmic-nvidia-userns.yml
@@ -0,0 +1,18 @@
+name: cosmic-nvidia-userns-hardened
+
+description: "Cosmic nvidia with some hardening applied"
+
+base-image: ghcr.io/ublue-os/cosmic-base-nvidia
+
+image-version: 40
+
+modules:
+  - from-file: common/initialization-scripts.yml
+  - from-file: common/gui-packages.yml
+  - from-file: common/common-packages.yml
+  - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/remove-firefox.yml
+  - type: secureblue-signing
+  - type: yafti 
diff --git a/recipes/general/recipe-cosmic-nvidia.yml b/recipes/general/recipe-cosmic-nvidia.yml
new file mode 100644
index 0000000..27c4fe1
--- /dev/null
+++ b/recipes/general/recipe-cosmic-nvidia.yml
@@ -0,0 +1,20 @@
+name: cosmic-nvidia-hardened
+
+description: "Cosmic nvidia with some hardening applied"
+
+base-image: ghcr.io/ublue-os/cosmic-base-nvidia
+
+image-version: 40
+
+modules:
+  - from-file: common/initialization-scripts.yml
+  - from-file: common/gui-packages.yml
+  - from-file: common/common-packages.yml
+  - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/remove-firefox.yml
+  - from-file: common/disableuserns-packages.yml
+  - from-file: common/disableuserns-scripts.yml
+  - type: secureblue-signing
+  - type: yafti