diff --git a/src/session/budgie-desktop-labwc.desktop.in.in b/src/session/budgie-desktop-labwc.desktop.in.in
index 6cdb783cd..4c6f51615 100644
--- a/src/session/budgie-desktop-labwc.desktop.in.in
+++ b/src/session/budgie-desktop-labwc.desktop.in.in
@@ -5,4 +5,4 @@ Exec=@prefix@/bin/labwc -S /usr/bin/budgie-desktop
 TryExec=@prefix@/bin/labwc
 Icon=
 Type=Application
-DesktopNames=Budgie;GNOME
+DesktopNames=Budgie
diff --git a/src/session/budgie-desktop.desktop.in.in b/src/session/budgie-desktop.desktop.in.in
index d8c34c1bd..b028149bd 100644
--- a/src/session/budgie-desktop.desktop.in.in
+++ b/src/session/budgie-desktop.desktop.in.in
@@ -5,4 +5,4 @@ Exec=@prefix@/bin/magpie-wm -s /usr/bin/budgie-desktop
 TryExec=@prefix@/bin/magpie-wm
 Icon=
 Type=Application
-DesktopNames=Budgie;GNOME
+DesktopNames=Budgie
diff --git a/src/session/budgie-desktop.in b/src/session/budgie-desktop.in
index 8cd8dbc8d..cb39cade6 100755
--- a/src/session/budgie-desktop.in
+++ b/src/session/budgie-desktop.in
@@ -9,7 +9,7 @@ if [ "$1" = "--version" ]; then
 fi
 
 if [ -z $XDG_CURRENT_DESKTOP ]; then
-  XDG_CURRENT_DESKTOP=Budgie:GNOME
+  XDG_CURRENT_DESKTOP=Budgie
   export XDG_CURRENT_DESKTOP
 fi
 
diff --git a/src/session/meson.build b/src/session/meson.build
index ab841b99f..b758a72fa 100644
--- a/src/session/meson.build
+++ b/src/session/meson.build
@@ -5,40 +5,18 @@ session_data = configuration_data()
 session_data.set('PACKAGE_VERSION', package_version)
 session_data.set('libexecdir', libexecdir)
 
-gnome_session_components = [
-    'gnome-settings-daemon',
-]
-
-gnome_session_324_components = [
-    'org.gnome.SettingsDaemon.A11ySettings',
-    'org.gnome.SettingsDaemon.Color',
-    'org.gnome.SettingsDaemon.Datetime',
-    'org.gnome.SettingsDaemon.Housekeeping',
-    'org.gnome.SettingsDaemon.Keyboard',
-    'org.gnome.SettingsDaemon.MediaKeys',
-    'org.gnome.SettingsDaemon.Power',
-    'org.gnome.SettingsDaemon.PrintNotifications',
-    'org.gnome.SettingsDaemon.Rfkill',
-    'org.gnome.SettingsDaemon.Sharing',
-    'org.gnome.SettingsDaemon.Smartcard',
-    'org.gnome.SettingsDaemon.Sound',
-    'org.gnome.SettingsDaemon.Wacom',
-    'org.gnome.SettingsDaemon.XSettings',
-]
-
-gsd_324_key = [
-    'org.gnome.SettingsDaemon.A11yKeyboard'
-]
-
-gsd_324_mc = [
-    'org.gnome.SettingsDaemon.Clipboard',
-    'org.gnome.SettingsDaemon.Mouse'
-]
-
-
-gsd_324_max = [
-    'org.gnome.SettingsDaemon.Orientation',
-    'org.gnome.SettingsDaemon.XRANDR',
+# mandatory gnome-settings-daemon components
+budgie_session_324_components = [
+    'org.buddiesofbudgie.SettingsDaemon.A11ySettings',
+    'org.buddiesofbudgie.SettingsDaemon.Datetime',
+    'org.buddiesofbudgie.SettingsDaemon.Housekeeping',
+    'org.buddiesofbudgie.SettingsDaemon.Power',
+    'org.buddiesofbudgie.SettingsDaemon.PrintNotifications',
+    'org.buddiesofbudgie.SettingsDaemon.Rfkill',
+    'org.buddiesofbudgie.SettingsDaemon.Sharing',
+    'org.buddiesofbudgie.SettingsDaemon.Smartcard',
+    'org.buddiesofbudgie.SettingsDaemon.Sound',
+    'org.buddiesofbudgie.SettingsDaemon.Wacom',
 ]
 
 # Always in Budgie
@@ -53,18 +31,7 @@ if with_polkit == true
 endif
 
 dep_gsd = dependency('gnome-settings-daemon', version: gnome_minimum_version)
-# Merge the list depending on the gnome-settings-daemon version.
-if dep_gsd.version().version_compare('>=3.33.90')
-    session_components = budgie_components + gnome_session_324_components
-elif dep_gsd.version().version_compare('>=3.27.90')
-    session_components = budgie_components + gnome_session_324_components + gsd_324_mc
-elif dep_gsd.version().version_compare('>=3.25.4')
-    session_components = budgie_components + gnome_session_324_components + gsd_324_mc + gsd_324_key
-elif dep_gsd.version().version_compare('>=3.23.3')
-    session_components = budgie_components + gnome_session_324_components + gsd_324_mc + gsd_324_key + gsd_324_max
-else
-    session_components = gnome_session_components + budgie_components
-endif
+session_components = budgie_components + budgie_session_324_components
 
 # Set the session list
 session_data.set('SESSION_COMPONENTS', ';'.join(session_components))
@@ -174,3 +141,11 @@ custom_target('desktop-file-powerdialog',
     install : true,
     install_dir : xdg_appdir,
 )
+
+# install gnome-settings-daemon desktop files to ensure they autostart
+
+install_subdir(
+    'settingsdaemon',
+    install_dir: xdg_appdir,
+    strip_directory: true
+)
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.A11ySettings.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.A11ySettings.desktop
new file mode 100644
index 000000000..d195e6278
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.A11ySettings.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop accessibility
+Exec=/usr/libexec/gsd-a11y-settings
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
+
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Datetime.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Datetime.desktop
new file mode 100644
index 000000000..d17187708
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Datetime.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie date & time
+Exec=/usr/libexec/gsd-datetime
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify.desktop
new file mode 100644
index 000000000..f6d2b6ac1
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=gnome-disk-utility notification plugin for GNOME Settings Daemon (Budgie)
+Exec=/usr/libexec/gsd-disk-utility-notify
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-AutoRestart=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Housekeeping.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Housekeeping.desktop
new file mode 100644
index 000000000..61d536b42
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Housekeeping.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop maintenance of expirable data
+Exec=/usr/libexec/gsd-housekeeping
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Power.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Power.desktop
new file mode 100644
index 000000000..a48b1c5e2
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Power.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie power management
+Exec=/usr/libexec/gsd-power
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.PrintNotifications.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.PrintNotifications.desktop
new file mode 100644
index 000000000..41c9b8d58
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.PrintNotifications.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop printer notifications
+Exec=/usr/libexec/gsd-print-notifications
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Rfkill.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Rfkill.desktop
new file mode 100644
index 000000000..9fe8b24be
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Rfkill.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop RFKill support
+Exec=/usr/libexec/gsd-rfkill
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Sharing.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Sharing.desktop
new file mode 100644
index 000000000..51649d849
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Sharing.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop file sharing
+Exec=/usr/libexec/gsd-sharing
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Smartcard.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Smartcard.desktop
new file mode 100644
index 000000000..0b84ed968
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Smartcard.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop smartcard
+Exec=/usr/libexec/gsd-smartcard
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Sound.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Sound.desktop
new file mode 100644
index 000000000..fa6ae7296
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Sound.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop sound sample caching
+Exec=/usr/libexec/gsd-sound
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.UsbProtection.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.UsbProtection.desktop
new file mode 100644
index 000000000..2bbd9fed9
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.UsbProtection.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop USB protection
+Exec=/usr/libexec/gsd-usb-protection
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Wacom.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Wacom.desktop
new file mode 100644
index 000000000..4a9327d1d
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Wacom.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop Wacom tablet support
+Exec=/usr/libexec/gsd-wacom
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
diff --git a/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Wwan.desktop b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Wwan.desktop
new file mode 100644
index 000000000..98149084a
--- /dev/null
+++ b/src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Wwan.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Budgie Desktop WWan support
+Exec=/usr/libexec/gsd-wwan
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true