diff --git a/images/base/.devcontainer/Dockerfile b/images/base/.devcontainer/Dockerfile
index bb432fe..95dd60f 100644
--- a/images/base/.devcontainer/Dockerfile
+++ b/images/base/.devcontainer/Dockerfile
@@ -1,4 +1,8 @@
 FROM buildpack-deps:trixie-curl
 
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends tmux \
+    && rm -rf /var/lib/apt/lists/*
+
 # Default Prettier configuration (fallback for projects without .prettierrc)
 COPY .prettierrc /workspaces/.prettierrc
diff --git a/images/base/.devcontainer/devcontainer.json b/images/base/.devcontainer/devcontainer.json
index a038e10..9bc9495 100644
--- a/images/base/.devcontainer/devcontainer.json
+++ b/images/base/.devcontainer/devcontainer.json
@@ -13,7 +13,8 @@
       "version": "latest",
       "ppa": "false"
     },
-    "ghcr.io/devcontainers/features/node:1": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/node:2": {
       "version": "24"
     },
     "ghcr.io/shokkunrf/devcontainer-features/claude-code:1": {},
diff --git a/images/base/README.md b/images/base/README.md
index 135dc4b..0a5bb13 100644
--- a/images/base/README.md
+++ b/images/base/README.md
@@ -16,10 +16,12 @@ Base devcontainer image with common tools.
 | --- | --- |
 | common-utils (`developer` user) | [devcontainers/features/common-utils](https://github.com/devcontainers/features/tree/main/src/common-utils) |
 | git | [devcontainers/features/git](https://github.com/devcontainers/features/tree/main/src/git) |
+| GitHub CLI (`gh`) | [devcontainers/features/github-cli](https://github.com/devcontainers/features/tree/main/src/github-cli) |
 | Node.js 24 + npm | [devcontainers/features/node](https://github.com/devcontainers/features/tree/main/src/node) |
 | prettier | [prettier](https://www.npmjs.com/package/prettier) |
 | Claude Code | [@anthropic-ai/claude-code](https://www.npmjs.com/package/@anthropic-ai/claude-code) |
 | Gemini CLI | [@google/gemini-cli](https://www.npmjs.com/package/@google/gemini-cli) |
+| tmux | Debian apt |
 
 ## Testing
 
diff --git a/images/base/test-project/test.sh b/images/base/test-project/test.sh
index 9ee25c2..485156c 100755
--- a/images/base/test-project/test.sh
+++ b/images/base/test-project/test.sh
@@ -18,6 +18,8 @@ check "prettier" prettier --version
 check "claude" claude --version
 check "gemini" gemini --version
 check "wd" wd --version
+check "gh" gh --version
+check "tmux" tmux -V
 
 # Config checks
 check "prettierrc" test -f /workspaces/.prettierrc