diff --git a/modules/users/systemd.nix b/modules/users/systemd.nix
index 554855251..6c1ed8d7a 100644
--- a/modules/users/systemd.nix
+++ b/modules/users/systemd.nix
@@ -94,10 +94,12 @@ let
     })
     (lib.mkIf (startCommand != null) {
       serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
       serviceConfig.ExecStart = startCommand;
     })
     (lib.mkIf (cleanupCommand != null) {
       serviceConfig.ExecStopPost = cleanupCommand;
+      serviceConfig.TimeoutStopSec = "30s";  #< system-wide default is closer to 10s, but eg25-control-powered takes longer than that
     })
   ];