diff --git a/common/home/default.nix b/common/home/default.nix
index b8ad011..78a323f 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -225,6 +225,7 @@ in
             Service = {
               ExecStart = "${spotify}/bin/spotify";
               Type = "exec";
+              RestartSec = 15;
             };
           };
 
@@ -243,6 +244,7 @@ in
             ExecStart = "${pkgs.mako}/bin/mako";
             Type = "exec";
             Restart = "on-failure";
+            RestartSec = 15;
           };
         };
 
@@ -261,6 +263,7 @@ in
             ExecStart = "${pkgs.xwayland-satellite}/bin/xwayland-satellite";
             Type = "exec";
             Restart = "on-failure";
+            RestartSec = 15;
           };
         };
       }
@@ -320,6 +323,7 @@ in
                 inputs.automapaper.packages.${pkgs.system}.automapaper
               }/bin/automapaper -C ${display_config}/config.toml";
               Restart = "on-failure";
+              RestartSec = 15;
             };
           })
         ) displays
diff --git a/modules/waybar/default.nix b/modules/waybar/default.nix
index be09e48..d52521b 100644
--- a/modules/waybar/default.nix
+++ b/modules/waybar/default.nix
@@ -70,7 +70,6 @@ in
       package = cfg.package;
       systemd = {
         enable = true;
-        target = "niri.service";
       };
       settings = {
         mainBar = {