diff --git a/docker/docker-compose.full.yml b/docker/docker-compose.full.yml
index 6f34448c4..9c1d58d2b 100644
--- a/docker/docker-compose.full.yml
+++ b/docker/docker-compose.full.yml
@@ -10,6 +10,10 @@ services:
     container_name: picoclaw-agent-full
     profiles:
       - agent
+    environment:
+      # PicoClaw runs as root in container by default
+      # If running as non-root user, update these paths to match the user's home directory
+      - HOME=/root
     volumes:
       - ../config/config.json:/root/.picoclaw/config.json:ro
       - picoclaw-workspace:/root/.picoclaw/workspace
@@ -30,6 +34,10 @@ services:
     restart: unless-stopped
     profiles:
       - gateway
+    environment:
+      # PicoClaw runs as root in container by default
+      # If running as non-root user, update these paths to match the user's home directory
+      - HOME=/root
     volumes:
       # Configuration file
       - ../config/config.json:/root/.picoclaw/config.json:ro
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7c940621f..b5643d79d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     #extra_hosts:
     #  - "host.docker.internal:host-gateway"
     volumes:
-      - ./data:/root/.picoclaw
+      - ./data:/home/picoclaw/.picoclaw
     entrypoint: ["picoclaw", "agent"]
     stdin_open: true
     tty: true
@@ -31,7 +31,7 @@ services:
     #extra_hosts:
     #  - "host.docker.internal:host-gateway"
     volumes:
-      - ./data:/root/.picoclaw
+      - ./data:/home/picoclaw/.picoclaw
 
   # ─────────────────────────────────────────────
   # PicoClaw Launcher (Web Console + Gateway)
@@ -52,4 +52,4 @@ services:
       - "18800:18800"
       - "18790:18790"
     volumes:
-      - ./data:/root/.picoclaw
+      - ./data:/home/picoclaw/.picoclaw