diff --git a/Dockerfile b/Dockerfile
index f4038d5fb..a33f0077d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,6 +32,4 @@ RUN pnpm ui:build
 
 ENV NODE_ENV=production
 
-# Run the gateway with settings suitable for Render deployment
-# Password auth allows browser-based login via SETUP_PASSWORD env var
-CMD ["node", "dist/index.js", "gateway", "--port", "8080", "--bind", "lan", "--auth", "password", "--allow-unconfigured"]
+CMD ["node", "dist/index.js"]
diff --git a/render.yaml b/render.yaml
index 01923a8f6..85dcbe51b 100644
--- a/render.yaml
+++ b/render.yaml
@@ -3,18 +3,16 @@ services:
     name: clawdbot
     runtime: docker
     plan: starter
-    healthCheckPath: /health
+    dockerCommand: node dist/index.js gateway --port 8080 --bind lan --auth password --allow-unconfigured
     envVars:
       - key: PORT
         value: "8080"
-      - key: SETUP_PASSWORD
+      - key: CLAWDBOT_GATEWAY_PASSWORD
         sync: false
       - key: CLAWDBOT_STATE_DIR
         value: /data/.clawdbot
       - key: CLAWDBOT_WORKSPACE_DIR
         value: /data/workspace
-      - key: CLAWDBOT_GATEWAY_TOKEN
-        generateValue: true
     disk:
       name: clawdbot-data
       mountPath: /data