diff --git a/budgie-desktop-pkgs.yaml b/budgie-desktop-pkgs.yaml
new file mode 100644
index 0000000..b9bf5a7
--- /dev/null
+++ b/budgie-desktop-pkgs.yaml
@@ -0,0 +1,49 @@
+# DO NOT EDIT! This content is generated from comps-sync.py
+include: fedora-common-ostree.yaml
+packages:
+  - ModemManager
+  - NetworkManager-adsl
+  - NetworkManager-openconnect-gnome
+  - NetworkManager-openvpn-gnome
+  - NetworkManager-ppp
+  - NetworkManager-pptp-gnome
+  - NetworkManager-ssh-gnome
+  - NetworkManager-vpnc-gnome
+  - NetworkManager-wwan
+  - at-spi2-atk
+  - at-spi2-core
+  - budgie-backgrounds
+  - budgie-control-center
+  - budgie-desktop
+  - budgie-desktop-defaults
+  - budgie-desktop-view
+  - budgie-screensaver
+  - dconf
+  - firefox
+  - fprintd-pam
+  - glib-networking
+  - gnome-bluetooth
+  - gnome-color-manager
+  - gnome-disk-utility
+  - gnome-keyring-pam
+  - gnome-settings-daemon
+  - gnome-software
+  - gnome-system-monitor
+  - gnome-terminal
+  - gvfs-afc
+  - gvfs-afp
+  - gvfs-archive
+  - gvfs-fuse
+  - gvfs-goa
+  - gvfs-gphoto2
+  - gvfs-mtp
+  - gvfs-smb
+  - lightdm
+  - nemo
+  - network-manager-applet
+  - polkit
+  - seahorse
+  - slick-greeter
+  - xdg-desktop-portal
+  - xdg-desktop-portal-gtk
+  - xdg-user-dirs-gtk
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 0094586..de8827f 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -142,6 +142,26 @@ desktop_exclude_list:
     - totem
     - totem-nautilus
     - traceroute
+  budgie-desktop:
+    # Incompatible with ostree for various reasons
+    - abrt-desktop
+    - cups-pk-helper
+    - dnfdragora
+    # Remove uncommon NetworkManager plugins
+    - NetworkManager-fortisslvpn-gnome
+    - NetworkManager-iodine-gnome
+    - NetworkManager-l2tp-gnome
+    - NetworkManager-libreswan-gnome
+    - NetworkManager-sstp-gnome
+    - NetworkManager-strongswan-gnome
+  budgie-desktop-apps:
+    # Non-critical apps -> Flatpak
+    - atril
+    - eom
+    - gedit
+    - gnome-calculator
+    - parole
+    - rhythmbox
   kde-desktop:
     # Incompatible with ostree for various reasons
     - abrt-desktop
diff --git a/comps-sync.py b/comps-sync.py
index 8089020..b12573a 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -171,6 +171,7 @@ desktops_comps_groups = {
     "mate": ["mate-desktop"],
     "sway": ["swaywm", "swaywm-extended"],
     "cinnamon": ["cinnamon-desktop"],
+    "budgie": ["budgie-desktop", "budgie-desktop-apps"]
 }
 
 # Generate treefiles for all desktops
diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml
new file mode 100644
index 0000000..08666bd
--- /dev/null
+++ b/fedora-onyx.yaml
@@ -0,0 +1,14 @@
+include: budgie-desktop-pkgs.yaml
+ref: fedora/rawhide/${basearch}/onyx
+rojig:
+  name: fedora-onyx
+  summary: "Fedora Onyx (Budgie) base image"
+  license: MIT
+packages:
+  - fedora-release-onyx
+exclude-packages:
+  # Not needed in Budgie Desktop
+  - tracker
+  - tracker-miners
+repos:
+  - fedora-rawhide