diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
new file mode 100644
index 0000000..759f8dd
--- /dev/null
+++ b/cinnamon-desktop-pkgs.yaml
@@ -0,0 +1,46 @@
+# DO NOT EDIT! This content is generated from comps-sync.py
+include: fedora-common-ostree.yaml
+packages:
+  - NetworkManager-adsl
+  - NetworkManager-bluetooth
+  - NetworkManager-openconnect-gnome
+  - NetworkManager-openvpn-gnome
+  - NetworkManager-ppp
+  - NetworkManager-pptp-gnome
+  - NetworkManager-vpnc-gnome
+  - NetworkManager-wifi
+  - NetworkManager-wwan
+  - blueman
+  - cinnamon
+  - cinnamon-control-center
+  - cinnamon-screensaver
+  - firefox
+  - firewall-config
+  - gnome-disk-utility
+  - gnome-screenshot
+  - gnome-system-monitor
+  - gnome-terminal
+  - gstreamer1-plugins-ugly-free
+  - gvfs-archive
+  - gvfs-gphoto2
+  - gvfs-mtp
+  - gvfs-smb
+  - imsettings-gsettings
+  - initial-setup-gui
+  - metacity
+  - nemo-fileroller
+  - nemo-image-converter
+  - nemo-preview
+  - nm-connection-editor
+  - pipewire-alsa
+  - pipewire-pulseaudio
+  - powerline
+  - qgnomeplatform-qt5
+  - redshift-gtk
+  - setroubleshoot
+  - slick-greeter
+  - slick-greeter-cinnamon
+  - system-config-printer
+  - wireplumber
+  - xawtv
+  - xdg-user-dirs-gtk
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 1875303..6ccc509 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -232,7 +232,6 @@ desktop_exclude_list:
     - xfburn
     - yelp
     # Non critical NetworkManager plugins
-    - NetworkManager-bluetooth
     - NetworkManager-iodine-gnome
     - NetworkManager-l2tp-gnome
     - NetworkManager-libreswan-gnome
@@ -240,9 +239,41 @@ desktop_exclude_list:
     - NetworkManager-sstp-gnome
     - NetworkManager-strongswan-gnome
     - NetworkManager-team
-    - NetworkManager-wifi
     # Already in the common set
     - wireplumber
   swaywm-extended:
     # Non-critical apps -> Flatpak
     - mpv
+  cinnamon-desktop:
+    # Incompatible with ostree for various reasons
+    - abrt-desktop
+    - abrt-java-connector
+    - dnfdragora-updater
+    # Non-critical apps -> Flatpak & toolbox
+    - eom
+    - gnome-calculator
+    - gucharmap
+    - hexchat
+    - mpv
+    - pidgin
+    - sane-backends-drivers-scanners
+    - shotwell
+    - simple-scan
+    - thunderbird
+    - tmux
+    - tmux-powerline
+    - transmission
+    - vim-powerline
+    - xed
+    - xfburn
+    - xreader
+    # Not default to cinnamon
+    - paper-icon-theme
+    # Non critical NetworkManager plugins
+    - NetworkManager-iodine-gnome
+    - NetworkManager-l2tp-gnome
+    - NetworkManager-libreswan-gnome
+    - NetworkManager-ovs
+    - NetworkManager-sstp-gnome
+    - NetworkManager-strongswan-gnome
+    - NetworkManager-team
diff --git a/comps-sync.py b/comps-sync.py
index e324e8b..8089020 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -170,6 +170,7 @@ desktops_comps_groups = {
     "deepin": ["deepin-desktop"],
     "mate": ["mate-desktop"],
     "sway": ["swaywm", "swaywm-extended"],
+    "cinnamon": ["cinnamon-desktop"],
 }
 
 # Generate treefiles for all desktops
diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml
new file mode 100644
index 0000000..3bf70b7
--- /dev/null
+++ b/fedora-cinnamon.yaml
@@ -0,0 +1,17 @@
+include: cinnamon-desktop-pkgs.yaml
+ref: fedora/rawhide/${basearch}/cinnamon
+rojig:
+  name: fedora-cinnamon
+  summary: "Fedora Cinnamon base image"
+  license: MIT
+
+packages:
+  # Portals for Flatpak
+  - xdg-desktop-portal-gtk
+  # Include GUI to manage updates & Flatpaks
+  - gnome-software
+
+repos:
+  - fedora-rawhide
+  # - fedora-39
+  # - fedora-39-updates
diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml
index d4fed91..9830a02 100644
--- a/mate-desktop-pkgs.yaml
+++ b/mate-desktop-pkgs.yaml
@@ -2,12 +2,14 @@
 include: fedora-common-ostree.yaml
 packages:
   - NetworkManager-adsl
+  - NetworkManager-bluetooth
   - NetworkManager-openconnect-gnome
   - NetworkManager-openvpn-gnome
   - NetworkManager-ppp
   - NetworkManager-pptp-gnome
   - NetworkManager-ssh-gnome
   - NetworkManager-vpnc-gnome
+  - NetworkManager-wifi
   - NetworkManager-wwan
   - atril
   - atril-caja