diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index da1d8aa6..416edae3 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -81,10 +81,10 @@ COPY --chown=vscode:vscode script/install-claude-plugins.sh /tmp/install-claude-
 
 # Install Claude plugins using BuildKit secret
 # Build with: DOCKER_BUILDKIT=1 docker build --secret id=claude_credentials,src=$HOME/.claude/.credentials.json .
-USER vscode
-RUN --mount=type=secret,id=claude_credentials \
-    /tmp/install-claude-plugins.sh /home/vscode/.claude/plugins/plugins.txt || true
-USER root
+# Note: Run as root to access BuildKit secret, then change ownership to vscode
+RUN --mount=type=secret,id=claude_credentials,uid=0,gid=0 \
+    /tmp/install-claude-plugins.sh /home/vscode/.claude/plugins/plugins.txt || true \
+    && chown -R vscode:vscode /home/vscode/.claude
 
 RUN chsh -s /bin/bash vscode