diff --git a/configs/mcp.nix b/configs/mcp.nix
index b0746fd..8e11d63 100644
--- a/configs/mcp.nix
+++ b/configs/mcp.nix
@@ -4,15 +4,18 @@
 # and a systemd service for the agent daemon.
 { pkgs, ... }:
 
+let
+  mcpUid = 995;
+in
 {
   users.users.mcp = {
     isSystemUser = true;
+    uid = mcpUid; # Pin UID so systemd Environment references stay stable.
     group = "mcp";
     home = "/srv/mcp";
     shell = pkgs.shadow; # nologin equivalent
     subUidRanges = [{ startUid = 100000; count = 65536; }];
     subGidRanges = [{ startGid = 100000; count = 65536; }];
-    # Lingering enables user services (podman) to run without an active login session.
     linger = true;
   };
 
@@ -34,7 +37,7 @@
       Group = "mcp";
       Environment = [
         "HOME=/srv/mcp"
-        "XDG_RUNTIME_DIR=/run/user/%U"
+        "XDG_RUNTIME_DIR=/run/user/${toString mcpUid}"
         "PATH=/run/current-system/sw/bin:/usr/local/bin"
       ];