diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e6d1d9ad..b4f8261d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,6 +3,8 @@ FROM node:20
 ARG TZ
 ENV TZ="$TZ"
 
+ARG CLAUDE_CODE_VERSION=latest
+
 # Install basic development tools and iptables/ipset
 RUN apt-get update && apt-get install -y --no-install-recommends \
   less \
@@ -77,7 +79,8 @@ RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/
   -x
 
 # Install Claude
-RUN npm install -g @anthropic-ai/claude-code
+RUN npm install -g @anthropic-ai/claude-code@${CLAUDE_CODE_VERSION}
+
 
 # Copy and set up firewall script
 COPY init-firewall.sh /usr/local/bin/
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b1ccf4b9..850e23ba 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,6 +4,7 @@
     "dockerfile": "Dockerfile",
     "args": {
       "TZ": "${localEnv:TZ:America/Los_Angeles}",
+      "CLAUDE_CODE_VERSION": "latest",
       "GIT_DELTA_VERSION": "0.18.2",
       "ZSH_IN_DOCKER_VERSION": "1.2.0"
     }