diff --git a/panel/nix/configuration.nix b/panel/nix/configuration.nix
index d790e30c..e261fd95 100644
--- a/panel/nix/configuration.nix
+++ b/panel/nix/configuration.nix
@@ -58,13 +58,13 @@ let
     text =
       ''
         systemd-run --pty \
-          --same-dir \
           --wait \
           --collect \
           --service-type=exec \
           --unit "manage-${name}.service" \
           --property "User=${name}" \
           --property "Group=${name}" \
+          --property "WorkingDirectory=/var/lib/${name}" \
           --property "Environment=DATABASE_URL=${database-url} USER_SETTINGS_FILE=${configFile}" \
       ''
       + optionalString (credentials != [ ]) (