diff --git a/config.nix b/config.nix
index 489a7d0..0a4e3a6 100644
--- a/config.nix
+++ b/config.nix
@@ -43,7 +43,7 @@
         monitors = [
           # "DP-2, highres@165,0x1080,1,vrr,1"
           # "DP-2, highres@180,0x1080,1,cm,hdr, sdrbrightness, 1.5, sdrsaturation, 0.98"
-          "DP-1, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98,vrr,1"
+          "DP-1, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98"
           "DP-2, highres@highrr,0x0,1"
           "HDMI-A-1, 1920x1080@120, 20000x20000,1"
           # "HDMI-A-1, disabled"
diff --git a/packages/moondeck-buddy/appimage.nix b/packages/moondeck-buddy/appimage.nix
index 8c6e034..8b4657f 100644
--- a/packages/moondeck-buddy/appimage.nix
+++ b/packages/moondeck-buddy/appimage.nix
@@ -4,6 +4,7 @@
   pkgs,
   lib,
   fetchurl,
+  myConfig,
   ...
 }: let
   moondeckBuddyWrapped = pkgs.appimageTools.wrapType2 {
@@ -63,7 +64,7 @@ in {
 
     serviceConfig = {
       Type = "simple";
-      User = "kenji"; # <--- IMPORTANT: User *must* have access to the display
+      User = "${myConfig.essentials.Username}"; # <--- IMPORTANT: User *must* have access to the display
       Group = "users";
 
       ExecStart = "${moondeckBuddyWrapped}/bin/moondeck-buddy";
diff --git a/packages/sunshine/config.nix b/packages/sunshine/config.nix
index 973d4a5..2f4f0e9 100644
--- a/packages/sunshine/config.nix
+++ b/packages/sunshine/config.nix
@@ -29,8 +29,10 @@ in {
       capabilities = "cap_sys_admin+p";
       source = "${pkgs.sunshine}/bin/sunshine";
     };
-    systemd.user.services.sunshine = {
+    systemd.services.sunshine = {
       description = "Sunshine self-hosted game stream host for Moonlight";
+      after = ["network-online.target" "multi-user.target"];
+      wantedBy = ["multi-user.target"];
       startLimitBurst = 5;
       startLimitIntervalSec = 500;
       serviceConfig = {