diff --git a/Fedora.kiwi b/Fedora.kiwi
index ab31548..9cb7f3d 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -31,6 +31,7 @@
 	<include from="this://./components/desktops/sway.xml"/>
 	<include from="this://./components/desktops/budgie.xml"/>
 	<include from="this://./components/desktops/miraclewm.xml"/>
+	<include from="this://./components/desktops/cosmic.xml"/>
 	<include from="this://./components/liveinstall.xml"/>
 	<include from="this://./components/users.xml"/>
 	<include from="this://./teams/cloud/cloud.xml"/>
@@ -49,6 +50,7 @@
 	<include from="this://./teams/sway.xml"/>
 	<include from="this://./teams/budgie.xml"/>
 	<include from="this://./teams/miraclewm.xml"/>
+	<include from="this://./teams/cosmic.xml"/>
 	<include from="this://./teams/asahi.xml"/>
 	<packages type="bootstrap">
 		<package name="basesystem"/>
diff --git a/components/desktops/cosmic.xml b/components/desktops/cosmic.xml
new file mode 100644
index 0000000..4d010a7
--- /dev/null
+++ b/components/desktops/cosmic.xml
@@ -0,0 +1,11 @@
+<image>
+	<profiles>
+		<profile name="COSMIC-Desktop" description="COSMIC Desktop">
+			<requires profile="DesktopCommon"/>
+		</profile>
+	</profiles>
+	<packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop">
+		<!-- install env-group to resolve RhBug:1891500 -->
+		<namedCollection name="cosmic-desktop-environment"/>
+	</packages>
+</image>
diff --git a/config.sh b/config.sh
index 2bd6ef3..74ce9f6 100755
--- a/config.sh
+++ b/config.sh
@@ -69,6 +69,9 @@ if [[ "$kiwi_profiles" == *"Live"* ]]; then
 	if [[ "$kiwi_profiles" == *"Cinnamon"* ]]; then
 		echo 'livesys_session="cinnamon"' > /etc/sysconfig/livesys
 	fi
+	if [[ "$kiwi_profiles" == *"COSMIC"* ]]; then
+		echo 'livesys_session="cosmic"' > /etc/sysconfig/livesys
+	fi
 	if [[ "$kiwi_profiles" == *"i3"* ]]; then
 		echo 'livesys_session="i3"' > /etc/sysconfig/livesys
 	fi
diff --git a/scripts/fedora-live-iso-label-generator b/scripts/fedora-live-iso-label-generator
index b1350de..7a3b943 100755
--- a/scripts/fedora-live-iso-label-generator
+++ b/scripts/fedora-live-iso-label-generator
@@ -32,6 +32,7 @@ volume_id_substitutions = {
              "Cinnamon": "Cinn",
                 "Cloud": "C",
            "Comp_Neuro": "CNr",
+               "COSMIC": "COSMIC",
          "Design_suite": "Dsgn",
        "Electronic_Lab": "Elec",
            "Everything": "E",
diff --git a/teams/cosmic.xml b/teams/cosmic.xml
new file mode 100644
index 0000000..6fe057d
--- /dev/null
+++ b/teams/cosmic.xml
@@ -0,0 +1,15 @@
+<image>
+	<profiles>
+		<profile name="COSMIC-Live" description="COSMIC Spin Live DVD">
+			<requires profile="COSMIC-Desktop"/>
+			<requires profile="LiveInstall"/>
+		</profile>
+		<profile name="COSMIC-Disk" description="COSMIC Spin Install Disk">
+			<requires profile="COSMIC-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
+	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="COSMIC-Live,COSMIC-Disk">
+		<package name="fedora-release-cosmic"/>
+	</packages>
+</image>