diff --git a/.clawteam/teams/dev-team/config.json b/.clawteam/teams/dev-team/config.json
new file mode 100644
index 0000000..1d8ddbc
--- /dev/null
+++ b/.clawteam/teams/dev-team/config.json
@@ -0,0 +1,37 @@
+{
+  "name": "dev-team",
+  "description": "Production dev team: Tech Lead, Frontend, Backend, UX/UI",
+  "leadAgentId": "leader-001",
+  "createdAt": "2026-04-06T02:42:22.422921+00:00",
+  "members": [
+    {
+      "name": "leader",
+      "user": "",
+      "agentId": "leader-001",
+      "agentType": "leader",
+      "joinedAt": "2026-04-06T02:42:22.422889+00:00"
+    },
+    {
+      "name": "uxui-dev",
+      "user": "",
+      "agentId": "8c3c909b44ec",
+      "agentType": "general-purpose",
+      "joinedAt": "2026-04-06T02:44:31.857759+00:00"
+    },
+    {
+      "name": "backend-dev",
+      "user": "",
+      "agentId": "7dfa9e8efa4f",
+      "agentType": "general-purpose",
+      "joinedAt": "2026-04-06T02:44:31.941566+00:00"
+    },
+    {
+      "name": "frontend-dev",
+      "user": "",
+      "agentId": "27dd094b4911",
+      "agentType": "general-purpose",
+      "joinedAt": "2026-04-06T02:45:32.846156+00:00"
+    }
+  ],
+  "budgetCents": 0.0
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4316e4b..6ef0820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,4 +79,16 @@
 .openclaw/workspace/*.env
 
 .idea
-.openclaw/subagents/runs.json
\ No newline at end of file
+.openclaw/subagents/runs.json
+
+# ==========================================
+# 5. Clawteam Data
+# ==========================================
+.clawteam/*
+!.clawteam/teams/
+!.clawteam/teams/*/
+.clawteam/teams/*/events/
+.clawteam/teams/*/inboxes/
+.clawteam/teams/*/spawn_registry.json
+.clawteam/teams/*/spawn_registry.json.lock
+!.clawteam/teams/*/config.json
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d327d50..e4ea8ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,7 @@ services:
       TZ: ${OPENCLAW_TZ:-UTC}
     volumes:
       - ${OPENCLAW_CONFIG_DIR:-./.openclaw}:/home/node/.openclaw
+      - ${CLAWTEAM_CONFIG_DIR:-./.clawteam}:/home/node/.clawteam
       - ${OPENCLAW_WORKSPACE_DIR:-./.openclaw/workspace}:/home/node/.openclaw/workspace
     ports:
       - "${OPENCLAW_GATEWAY_PORT:-18789}:18789"
@@ -41,39 +42,38 @@ services:
       timeout: 5s
       retries: 5
       start_period: 20s
-
-  openclaw-cli:
-    image: openclaw-clawteam:latest
-    pull_policy: build
-    network_mode: "service:openclaw-gateway"
-    deploy:
-      resources:
-        limits:
-          cpus: '2'
-          memory: 4G
-    cap_drop:
-      - NET_RAW
-      - NET_ADMIN
-    security_opt:
-      - no-new-privileges:true
-    environment:
-      HOME: /home/node
-      TERM: xterm-256color
-      NODE_OPTIONS: "--max-old-space-size=4096"
-      OPENCLAW_GATEWAY_TOKEN: ${OPENCLAW_GATEWAY_TOKEN:-team-token}
-      OPENCLAW_ALLOW_INSECURE_PRIVATE_WS: ${OPENCLAW_ALLOW_INSECURE_PRIVATE_WS:-}
-      BROWSER: echo
-      CLAUDE_AI_SESSION_KEY: ${CLAUDE_AI_SESSION_KEY:-}
-      CLAUDE_WEB_SESSION_KEY: ${CLAUDE_WEB_SESSION_KEY:-}
-      CLAUDE_WEB_COOKIE: ${CLAUDE_WEB_COOKIE:-}
-      TZ: ${OPENCLAW_TZ:-UTC}
-    volumes:
-      - ${OPENCLAW_CONFIG_DIR:-./.openclaw}:/home/node/.openclaw
-      - ${OPENCLAW_WORKSPACE_DIR:-./.openclaw/workspace}:/home/node/.openclaw/workspace
-    stdin_open: true
-    tty: true
-    init: true
-    entrypoint: [ "/bin/bash", "-c" ]
-    command: [ "tail -f /dev/null" ]
-    depends_on:
-      - openclaw-gateway
+  # openclaw-cli:
+  #   image: openclaw-clawteam:latest
+  #   pull_policy: build
+  #   network_mode: "service:openclaw-gateway"
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         cpus: '2'
+  #         memory: 4G
+  #   cap_drop:
+  #     - NET_RAW
+  #     - NET_ADMIN
+  #   security_opt:
+  #     - no-new-privileges:true
+  #   environment:
+  #     HOME: /home/node
+  #     TERM: xterm-256color
+  #     NODE_OPTIONS: "--max-old-space-size=4096"
+  #     OPENCLAW_GATEWAY_TOKEN: ${OPENCLAW_GATEWAY_TOKEN:-team-token}
+  #     OPENCLAW_ALLOW_INSECURE_PRIVATE_WS: ${OPENCLAW_ALLOW_INSECURE_PRIVATE_WS:-}
+  #     BROWSER: echo
+  #     CLAUDE_AI_SESSION_KEY: ${CLAUDE_AI_SESSION_KEY:-}
+  #     CLAUDE_WEB_SESSION_KEY: ${CLAUDE_WEB_SESSION_KEY:-}
+  #     CLAUDE_WEB_COOKIE: ${CLAUDE_WEB_COOKIE:-}
+  #     TZ: ${OPENCLAW_TZ:-UTC}
+  #   volumes:
+  #     - ${OPENCLAW_CONFIG_DIR:-./.openclaw}:/home/node/.openclaw
+  #     - ${OPENCLAW_WORKSPACE_DIR:-./.openclaw/workspace}:/home/node/.openclaw/workspace
+  #   stdin_open: true
+  #   tty: true
+  #   init: true
+  #   entrypoint: [ "/bin/bash", "-c" ]
+  #   command: [ "tail -f /dev/null" ]
+  #   depends_on:
+  #     - openclaw-gateway