diff --git a/overlays/gnome/etc/systemd/system/multi-user.target.wants/remove-classic.service b/overlays/gnome/etc/systemd/system/multi-user.target.wants/remove-classic.service
new file mode 120000
index 0000000000000000000000000000000000000000..45c426a0425646d7eb4927be0e74267600e8b7cd
--- /dev/null
+++ b/overlays/gnome/etc/systemd/system/multi-user.target.wants/remove-classic.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/remove-classic.service
\ No newline at end of file
diff --git a/overlays/gnome/usr/lib/systemd/system/remove-classic.service b/overlays/gnome/usr/lib/systemd/system/remove-classic.service
index d9dbdd7b511676981623b71daffc001113ca8b74..136325a9dd2a6fc026ad41fb165bd3801d62d931 100644
--- a/overlays/gnome/usr/lib/systemd/system/remove-classic.service
+++ b/overlays/gnome/usr/lib/systemd/system/remove-classic.service
@@ -1,9 +1,8 @@
 [Unit]
-After=network.target
+Description=Disable Gnome Classic
 
 [Service]
-User=root
 ExecStart=/usr/local/bin/remove-classic.sh
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/services/gnome b/services/gnome
index 7c1513d1cd9ea44b23e4ff68e81643c6e2298e5d..e2d4a02c775e14679a3bd34faf574bd1d4699ce7 100644
--- a/services/gnome
+++ b/services/gnome
@@ -5,4 +5,3 @@ bluetooth.service
 tlp.service
 bootsplash-hide-when-booted.service
 bootsplash-show-on-shutdown.service
-remove-classic.service