diff --git a/images/base/.devcontainer/devcontainer.json b/images/base/.devcontainer/devcontainer.json
index e1baab0..5c7bcdd 100644
--- a/images/base/.devcontainer/devcontainer.json
+++ b/images/base/.devcontainer/devcontainer.json
@@ -16,8 +16,7 @@
     "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {
       "yqVersion": "4"
     },
-    "ghcr.io/devcontainers/features/github-cli:1": {},
-    "ghcr.io/anthropics/devcontainer-features/claude-code:1": {}
+    "ghcr.io/devcontainers/features/github-cli:1": {}
   },
   "customizations": {
     "vscode": {
@@ -28,6 +27,7 @@
         "GitHub.vscode-github-actions",
         "ms-vscode.makefile-tools",
         "ms-vsliveshare.vsliveshare",
+        "anthropic.claude-code",
         "openai.chatgpt"
       ],
       "settings": {
diff --git a/images/full/.devcontainer/devcontainer.json b/images/full/.devcontainer/devcontainer.json
index 6f67cef..7ed1bc4 100644
--- a/images/full/.devcontainer/devcontainer.json
+++ b/images/full/.devcontainer/devcontainer.json
@@ -13,7 +13,8 @@
     "ghcr.io/devcontainers-extra/features/pipx-package:1": {
       "package": "cruft"
     },
-    "ghcr.io/devcontainers/features/python:1": {}
+    "ghcr.io/devcontainers/features/python:1": {},
+    "ghcr.io/devcontainers-extra/features/claude-code:2": {}
   },
   "customizations": {
     "vscode": {