diff --git a/Containerfile b/Containerfile
index 4995205e..8c9c9b35 100644
--- a/Containerfile
+++ b/Containerfile
@@ -141,6 +141,7 @@ RUN rm /usr/share/applications/shredder.desktop && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
     mkdir -p /etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /etc/flatpak/remotes.d && \
+    systemctl enable com.system76.Scheduler.service && \
     systemctl unmask flatpak-system-install.service && \
     systemctl enable flatpak-system-install.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
diff --git a/system_files/deck/shared/usr/lib/systemd/system-preset/00-system76.preset b/system_files/deck/shared/usr/lib/systemd/system-preset/00-system76.preset
deleted file mode 100644
index 6f5f31c9..00000000
--- a/system_files/deck/shared/usr/lib/systemd/system-preset/00-system76.preset
+++ /dev/null
@@ -1 +0,0 @@
-enable com.system76.Scheduler.service
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
index 91a3fa3d..95f97242 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
@@ -48,7 +48,6 @@ enable-system76-scheduler:
     git clone https://github.com/maxiberta/kwin-system76-scheduler-integration.git --depth 1 /tmp/kwin-system76-scheduler-integration
     kpackagetool5 --type=KWin/Script -i /tmp/kwin-system76-scheduler-integration
     systemctl --user enable --now com.system76.Scheduler.dbusproxy.service
-    systemctl enable --now com.system76.Scheduler.service
     kcmshell5 kcm_kwin_scripts
     rm -rf /tmp/kwin-system76-scheduler-integration
   elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index ac012628..d78dc2c9 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -51,7 +51,6 @@ enable-system76-scheduler:
     git clone https://github.com/maxiberta/kwin-system76-scheduler-integration.git --depth 1 /tmp/kwin-system76-scheduler-integration
     kpackagetool5 --type=KWin/Script -i /tmp/kwin-system76-scheduler-integration
     systemctl --user enable --now com.system76.Scheduler.dbusproxy.service
-    systemctl enable --now com.system76.Scheduler.service
     kcmshell5 kcm_kwin_scripts
     rm -rf /tmp/kwin-system76-scheduler-integration
   elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then