diff --git a/.dockerignore b/.dockerignore
index 285cf113e..4e3e251bb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,14 +2,8 @@
 .gitignore
 build/
 .picoclaw/
-config/
 .env
 .env.example
-*.md
 LICENSE
-assets/
-docker-compose.yml
-workspace/
-picoclaw-workspace/
 config/picoclaw-workspace/
 tmp/
diff --git a/docker-compose.yml b/docker-compose.yml
index 48769627c..02ad1ed41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,11 +8,9 @@ services:
       context: .
       dockerfile: Dockerfile
     container_name: picoclaw-agent
-    profiles:
-      - agent
     volumes:
       - ./config/config.json:/root/.picoclaw/config.json:ro
-      - picoclaw-workspace:/root/.picoclaw/workspace
+      - ./workspace:/root/.picoclaw/workspace
     entrypoint: ["picoclaw", "agent"]
     stdin_open: true
     tty: true
@@ -26,15 +24,10 @@ services:
       context: .
       dockerfile: Dockerfile
     container_name: picoclaw-gateway
-    restart: unless-stopped
-    profiles:
-      - gateway
     volumes:
       # Configuration file
       - ./config/config.json:/root/.picoclaw/config.json:ro
       # Persistent workspace (sessions, memory, logs)
-      - picoclaw-workspace:/root/.picoclaw/workspace
+      - ./workspace:/root/.picoclaw/workspace
     command: ["gateway"]
 
-volumes:
-  picoclaw-workspace: