diff --git a/nix/modules/spindle.nix b/nix/modules/spindle.nix
index 28561f4d..aaff2cd9 100644
--- a/nix/modules/spindle.nix
+++ b/nix/modules/spindle.nix
@@ -637,7 +637,10 @@ in
 
       localExecutorEnvironment = executor:
         processEnvironment executor.localService
-        ++ ["SPINDLE_ROLE=executor"]
+        ++ [
+          "SPINDLE_ROLE=executor"
+          "SPINDLE_SERVER_LOG_DIR=/var/log/${executor.localService.stateDirectory}"
+        ]
         ++ connectionEnvironment {
           inherit (executor) labels;
           inherit (executor.localService) millUrl seats;
@@ -721,7 +724,7 @@ in
               wantedBy = ["multi-user.target"];
               path = deps;
               serviceConfig = {
-                LogsDirectory = "spindle";
+                LogsDirectory = service.stateDirectory;
                 StateDirectory = service.stateDirectory;
                 Delegate = service.pipelines.microvm.cgroup.enable;
                 EnvironmentFile = mkIf (service.environmentFile != null) service.environmentFile;