diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
index 4c04736a2..4fbcc658f 100644
--- a/docker/docker-compose.local.yml
+++ b/docker/docker-compose.local.yml
@@ -9,6 +9,7 @@ services:
       context: ..
       dockerfile: docker/Dockerfile
     userns_mode: "keep-id"
+    user: "${UID:-1000}:${GID:-1000}"
     container_name: picoclaw-agent
     security_opt:
       - label=disable
@@ -33,6 +34,7 @@ services:
       context: ..
       dockerfile: docker/Dockerfile
     userns_mode: "keep-id"
+    user: "${UID:-1000}:${GID:-1000}"
     security_opt:
       - label=disable
     container_name: picoclaw-gateway