diff --git a/README.md b/README.md
index e6ac9be..320f714 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ This repository has multiple branches, one for each supported Fedora release. Th
 
 * Minimal (image type: `oem`, image profiles: `Minimal`)
 * Server (image type: `oem`, image profiles: `Server`)
+* Workstation Cinnamon (image type: `oem`, image profiles: `Workstation-Cinnamon`)
 * Workstation GNOME (image type: `oem`, image profiles: `Workstation-GNOME`)
 * Workstation KDE (image type: `oem`, image profiles: `Workstation-KDE`)
 
diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index 234d046..9c3a23e 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -3,6 +3,9 @@
 		<profile name="DesktopCommon" description="Common desktop packages">
 			<requires profile="Common"/>
 		</profile>
+		<profile name="Cinnamon-Desktop" description="Cinnamon Desktop">
+			<requires profile="DesktopCommon"/>
+		</profile>
 		<profile name="GNOME-Desktop" description="GNOME Desktop">
 			<requires profile="DesktopCommon"/>
 		</profile>
@@ -24,19 +27,23 @@
 		<ignore name="@dial-up"/>
 		<ignore name="@guest-desktop-agents"/>
 	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop">
+		<namedCollection name="cinnamon-desktop-environment"/>
+		<package name="fedora-release-cinnamon"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<namedCollection name="workstation-product-environment"/>
 		<package name="fedora-release-workstation"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
-		<ignore name="@admin-tools"/>
-		<ignore name="gnome-disk-utility"/>
-		<ignore name="system-config-printer"/>
 		<namedCollection name="kde-desktop-environment"/>
 		<namedCollection name="kde-apps"/>
 		<namedCollection name="kde-media"/>
 		<package name="fuse"/>
 		<package name="fedora-release-kde"/>
 		<package name="kde-l10n"/>
+		<ignore name="@admin-tools"/>
+		<ignore name="gnome-disk-utility"/>
+		<ignore name="system-config-printer"/>
 	</packages>
 </image>
diff --git a/config.sh b/config.sh
index 3436876..a2e67d1 100755
--- a/config.sh
+++ b/config.sh
@@ -71,7 +71,7 @@ touch /etc/reconfigSys
 #======================================
 # Setup default target
 #--------------------------------------
-if [[ "$kiwi_profiles" == *"GNOME"* ]] || [[ "$kiwi_profiles" == *"KDE"* ]]; then
+if [[ "$kiwi_profiles" == *"Cinnamon"* ]] || [[ "$kiwi_profiles" == *"GNOME"* ]] || [[ "$kiwi_profiles" == *"KDE"* ]]; then
 	systemctl set-default graphical.target
 else
 	systemctl set-default multi-user.target
diff --git a/platforms/workstation.xml b/platforms/workstation.xml
index 697eddf..02226fa 100644
--- a/platforms/workstation.xml
+++ b/platforms/workstation.xml
@@ -4,6 +4,10 @@
 			<requires profile="BootCore"/>
 			<requires profile="DesktopCommon"/>
 		</profile>
+		<profile name="Workstation-Cinnamon" description="Workstation with Cinnamon Desktop">
+			<requires profile="WorkstationCommon"/>
+			<requires profile="Cinnamon-Desktop"/>
+		</profile>
 		<profile name="Workstation-GNOME" description="Workstation with GNOME Desktop">
 			<requires profile="WorkstationCommon"/>
 			<requires profile="GNOME-Desktop"/>