diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index 1957b4d..ff82970 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
       python3 \
  && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
  && apt-get install -y --no-install-recommends nodejs \
- # Install GitHub CLI
+ # Install GitHub CLI \
  && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
       -o /usr/share/keyrings/githubcli-archive-keyring.gpg \
  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
@@ -21,6 +21,9 @@ RUN apt-get update \
 RUN npm install -g agent-browser \
  && npx playwright install-deps chromium
 
+# Install Claude Code by default when available
+RUN npm install -g @anthropic-ai/claude-code || true
+
 COPY package.json index.js /app/
 RUN cd /app && npm install --production
 
diff --git a/ubuntu/README.md b/ubuntu/README.md
index 8f75fe3..129c29c 100644
--- a/ubuntu/README.md
+++ b/ubuntu/README.md
@@ -104,3 +104,7 @@ Add as an MCP server in the orchestra UI:
 | Headers | `{"x-api-key": "<API_KEY>"}` if auth is enabled, otherwise `{}` |
 
 The `exec_command` tool will appear when fetching tools from the configured server.
+
+## Claude Code
+
+Claude Code is installed by default in the sandbox image when available.