diff --git a/docker-compose.yml b/docker-compose.yml
index aaf620ff0..02d9a2f0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,14 +10,14 @@ services:
     container_name: picoclaw-agent
     profiles:
       - agent
+    environment:
+      - HOME=/home/picoclaw
     # Uncomment to access host network; leave commented unless needed.
     #extra_hosts:
     #  - "host.docker.internal:host-gateway"
     volumes:
       - ./config/config.json:/home/picoclaw/.picoclaw/config.json:ro
-      - ./config/config.json:/root/.picoclaw/config.json:ro
       - picoclaw-workspace:/home/picoclaw/.picoclaw/workspace
-      - picoclaw-workspace:/root/.picoclaw/workspace
     entrypoint: ["picoclaw", "agent"]
     stdin_open: true
     tty: true
@@ -34,16 +34,16 @@ services:
     restart: unless-stopped
     profiles:
       - gateway
+    environment:
+      - HOME=/home/picoclaw
     # Uncomment to access host network; leave commented unless needed.
     #extra_hosts:
     #  - "host.docker.internal:host-gateway"
     volumes:
       # Configuration file
       - ./config/config.json:/home/picoclaw/.picoclaw/config.json:ro
-      - ./config/config.json:/root/.picoclaw/config.json:ro
       # Persistent workspace (sessions, memory, logs)
       - picoclaw-workspace:/home/picoclaw/.picoclaw/workspace
-      - picoclaw-workspace:/root/.picoclaw/workspace
     command: ["gateway"]
 
 volumes: