diff --git a/docker/moltbot/Dockerfile b/docker/moltbot/Dockerfile
index 765b5ea..937ad25 100644
--- a/docker/moltbot/Dockerfile
+++ b/docker/moltbot/Dockerfile
@@ -16,14 +16,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN npm install -g openclaw@latest
 
 # Create necessary directories
-RUN mkdir -p /home/node/.clawdbot /home/node/clawd /home/node/.cache
+RUN mkdir -p /home/node/.openclaw /home/node/clawd /home/node/.cache
 
 # Set environment variables
 # Python packages will be installed to /home/node/clawd so they persist after restart
 ENV HOME=/home/node \
     TERM=xterm-256color \
     PATH=/home/node/clawd/.local/bin:/usr/local/bin:/usr/bin:/bin \
-    CLAWDBOT_GATEWAY_BIND=0.0.0.0 \
+    OPENCLAW_GATEWAY_BIND=0.0.0.0 \
     PYTHONUSERBASE=/home/node/clawd/.local \
     UV_CACHE_DIR=/home/node/clawd/.cache/uv \
     PIP_USER=1
diff --git a/docker/moltbot/docker-entrypoint.sh b/docker/moltbot/docker-entrypoint.sh
deleted file mode 100644
index 8b61fb3..0000000
--- a/docker/moltbot/docker-entrypoint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-
-# Always update config to ensure trustedProxies is set for k8s ingress
-# Using clawdbot.json (default config name) instead of moltbot.json
-# Config includes:
-# - trustedProxies: k8s pod network CIDRs for nginx ingress
-# - controlUi.allowInsecureAuth: true - allows token-only auth behind reverse proxy
-# - auth.mode: token - requires gateway token for authentication
-echo '{"gateway":{"mode":"local","bind":"lan","port":18789,"trustedProxies":["10.42.0.0/16","10.43.0.0/16"],"controlUi":{"allowInsecureAuth":true},"auth":{"mode":"token"}},"agents":{"defaults":{"workspace":"/home/node/clawd"}}}' > /home/node/.clawdbot/clawdbot.json
-
-echo "Clawdbot config written:"
-cat /home/node/.clawdbot/clawdbot.json
-
-echo "Starting clawdbot gateway..."
-exec "$@"
diff --git a/home-apps/ai-bot.yaml b/home-apps/ai-bot.yaml
index 2cb2449..8b22179 100644
--- a/home-apps/ai-bot.yaml
+++ b/home-apps/ai-bot.yaml
@@ -92,8 +92,8 @@ stringData:
   gateway-token: "96101b63fec7789ef14e4691d30745c2a329170aa165f8dbe3174407ca61aefa"  # Generate with: openssl rand -hex 32
   # Optional: Claude AI credentials (NOT REQUIRED - can configure any provider later)
   # Supported providers: OpenRouter, Google Gemini, OpenAI, Anthropic, Venice AI, Ollama, etc.
-  # Configure via: kubectl exec -it deployment/moltbot-gateway -n home-apps -- node dist/index.js onboard
-  # Or edit config at: /home/node/.clawdbot/moltbot.json with model like:
+  # Configure via: kubectl exec -it deployment/openclaw-gateway -n home-apps -- node dist/index.js onboard
+  # Or edit config at: /home/node/.openclaw/openclaw.json with model like:
   # { "agents": { "defaults": { "model": { "primary": "openrouter/google/gemini-2.0-flash-exp" } } } }
   claude-ai-session-key: ""
   claude-web-session-key: ""
@@ -140,9 +140,9 @@ spec:
               value: "xterm-256color"
             - name: PATH
               value: "/usr/local/bin:/usr/bin:/bin"
-            - name: CLAWDBOT_GATEWAY_BIND
+            - name: OPENCLAW_GATEWAY_BIND
               value: "0.0.0.0"
-            - name: CLAWDBOT_GATEWAY_TOKEN
+            - name: OPENCLAW_GATEWAY_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: moltbot-credentials
@@ -167,7 +167,7 @@ spec:
                   optional: true
           volumeMounts:
             - name: config
-              mountPath: "/home/node/.clawdbot"
+              mountPath: "/home/node/.openclaw"
             - name: workspace
               mountPath: "/home/node/clawd"
           resources: