diff --git a/02-desktop/cosmic/manifest.yaml b/02-desktop/cosmic/manifest.yaml
new file mode 100644
index 0000000..8e7853c
--- /dev/null
+++ b/02-desktop/cosmic/manifest.yaml
@@ -0,0 +1,23 @@
+ref: fedora/${releasever}/${basearch}/cosmic
+rojig:
+  name: fedora-cosmic
+  summary: "Fedora Cosmic"
+  license: MIT
+
+include:
+  - ../base/manifest.yaml
+
+packages:
+  - tuned
+  - gnome-keyring
+  - cosmic-desktop
+
+# Cosmic specific workarounds and configuration
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+
+    # Setup display manager
+    rm -f /etc/systemd/system/display-manager.service
+    ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service
diff --git a/Containerfile b/Containerfile
index 5a196ac..56386ee 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,5 @@
 FROM quay.io/fedora/fedora:40 as repos
+COPY ./yum-repos /etc/yum.repos.d
 
 FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
 ARG MANIFEST=fedora-bootc-full.yaml
diff --git a/fedora-bootc-atomic-cosmic.yaml b/fedora-bootc-atomic-cosmic.yaml
new file mode 100644
index 0000000..484a853
--- /dev/null
+++ b/fedora-bootc-atomic-cosmic.yaml
@@ -0,0 +1,17 @@
+releasever: 40
+variables:
+  distro: "fedora"
+
+repos:
+  - fedora
+  - updates
+  - copr:copr.fedorainfracloud.org:ryanabx:cosmic-epoch
+
+metadata:
+  name: fedora-boot-atomic-cosmic
+  summary: Fedora Bootable Atomic Cosmic
+
+include:
+  - 01-minimal/kernel.yaml
+  - 01-minimal/manifest.yaml
+  - 02-desktop/cosmic/manifest.yaml
diff --git a/justfile b/justfile
index 4b25520..4ca5cf6 100644
--- a/justfile
+++ b/justfile
@@ -37,7 +37,7 @@ build-full:
         .
 
 build-atomic desktop:
-    podman build \
+    sudo podman build \
         --security-opt label=disable \
         --cap-add=all \
         --device /dev/fuse \
diff --git a/yum-repos/ryanabx-cosmic-epoch.repo b/yum-repos/ryanabx-cosmic-epoch.repo
new file mode 100644
index 0000000..0d654be
--- /dev/null
+++ b/yum-repos/ryanabx-cosmic-epoch.repo
@@ -0,0 +1,10 @@
+[copr:copr.fedorainfracloud.org:ryanabx:cosmic-epoch]
+name=Copr repo for cosmic-epoch owned by ryanabx
+baseurl=https://download.copr.fedorainfracloud.org/results/ryanabx/cosmic-epoch/fedora-$releasever-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/ryanabx/cosmic-epoch/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1