diff --git a/Dockerfile.devpod b/Dockerfile.devpod
index 66238fa..58481da 100644
--- a/Dockerfile.devpod
+++ b/Dockerfile.devpod
@@ -16,9 +16,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN curl -fsSL https://bun.sh/install | bash -s -- --install-dir /usr/local/bin \
     && ln -sf /usr/local/bin/bun /usr/local/bin/bunx
 
-# Claude Code CLI
-RUN curl -fsSL https://claude.ai/install.sh | bash
-
 # code-server (VS Code in browser)
 RUN curl -fsSL https://code-server.dev/install.sh | sh
 
diff --git a/entrypoint-devpod.sh b/entrypoint-devpod.sh
index 0f17d9e..5077dd3 100644
--- a/entrypoint-devpod.sh
+++ b/entrypoint-devpod.sh
@@ -41,6 +41,11 @@ if [ ! -f /root/.gitconfig ]; then
 EOF
 fi
 
+# Install Claude Code on first boot (installs to /root/.claude, persists on PVC)
+if [ ! -f /root/.claude/bin/claude ]; then
+  curl -fsSL https://claude.ai/install.sh | bash
+fi
+
 # Allow root login via SSH key, listen on internal port 2222
 echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
 echo "Port 2222" >> /etc/ssh/sshd_config