diff --git a/nix/modules/spindle.nix b/nix/modules/spindle.nix
index 8b2e1f03..f9db8ee9 100644
--- a/nix/modules/spindle.nix
+++ b/nix/modules/spindle.nix
@@ -862,6 +862,7 @@ in
                 "docker.service"
                 "spindle-mill-executors.service"
               ];
+              partOf = ["spindle.service"];
               wantedBy = ["multi-user.target"];
               path = deps;
               serviceConfig = {
@@ -1035,6 +1036,7 @@ in
                   else "${pkgs.coreutils}/bin/env SPINDLE_ROLE=${cfg.role} SPINDLE_MILL_ARTIFACT_STORE=${cfg.mill.artifactStore} SPINDLE_MILL_DRAIN_TIMEOUT=${toString cfg.mill.drainTimeout}s ${cfg.package}/bin/spindle";
                 TimeoutStopSec = cfg.mill.drainTimeout + 510;
                 Restart = "always";
+                RestartMode = mkIf (localExecutors != {}) "direct";
               };
             };
           }