diff --git a/.devcontainer/backend/Dockerfile b/.devcontainer/backend/Dockerfile
index 983670e4..ebe405a0 100644
--- a/.devcontainer/backend/Dockerfile
+++ b/.devcontainer/backend/Dockerfile
@@ -10,7 +10,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
     sudo jq vim curl git ca-certificates wget \
     build-essential pkg-config automake autoconf libtool \
-    ripgrep fd-find make unzip \
+    ripgrep fd-find make unzip bash-completion \
  && rm -rf /var/lib/apt/lists/*
 
 # Neovim latest (LazyVim needs >=0.9)
@@ -65,8 +65,8 @@ RUN echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \
 https://apt.releases.hashicorp.com $(lsb_release -cs) main" | \
 tee /etc/apt/sources.list.d/hashicorp.list
 RUN apt update
-RUN apt-get install terraform
-RUN terraform -install-autocomplete
+RUN apt-get install -y terraform
+RUN terraform -install-autocomplete || true
 
 # Install postgres
 RUN apt install -y wget gnupg2 lsb-release
@@ -86,16 +86,15 @@ USER ${USER}
 # Bootstrap LazyVim starter config
 RUN git clone https://github.com/LazyVim/starter /home/${USER}/.config/nvim \
     && rm -rf /home/${USER}/.config/nvim/.git
-# Install Claude + plugins
+# Install Claude + plugins + skills
 RUN curl -fsSL https://claude.ai/install.sh | bash \
     && export PATH="/home/${USER}/.local/bin:${PATH}" \
     && claude plugin marketplace add JuliusBrussee/caveman \
     && claude plugin install caveman@caveman \
-    && claude plugin marketplace add mattpocock/skills \
-    && claude plugin install skills@grill-me \
-    && claude plugin install skills@to-prd \
-    && claude plugin install skills@ubiquitous-language \
-    && claude plugin install skills@tdd \
-    && claude plugin install skills@improve-codebase-architecture
+    && npx skills@latest add --global --yes mattpocock/skills/grill-me \
+    && npx skills@latest add --global --yes mattpocock/skills/to-prd \
+    && npx skills@latest add --global --yes mattpocock/skills/ubiquitous-language \
+    && npx skills@latest add --global --yes mattpocock/skills/tdd \
+    && npx skills@latest add --global --yes mattpocock/skills/improve-codebase-architecture
 ENV PATH="/home/vscode/.local/bin:${PATH}"
 USER root
diff --git a/.devcontainer/backend/devcontainer.json b/.devcontainer/backend/devcontainer.json
index ee37224f..54e45095 100644
--- a/.devcontainer/backend/devcontainer.json
+++ b/.devcontainer/backend/devcontainer.json
@@ -17,7 +17,6 @@
         "ms-toolsai.jupyter",
         "mechatroner.rainbow-csv",
         "ms-toolsai.datawrangler",
-        "lindacong.vscode-book-reader",
         "4ops.terraform",
         "fabiospampinato.vscode-todo-plus",
         "jgclark.vscode-todo-highlight",
@@ -26,9 +25,6 @@
         "ms-python.black-formatter",
         "waderyan.gitblame",
         "GrapeCity.gc-excelviewer",
-        "jakobhoeg.vscode-pokemon",
-        "github.vscode-github-actions",
-        "me-dutour-mathieu.vscode-github-actions",
         "anthropic.claude-code",
         "eamodio.gitlens"
       ],
diff --git a/.devcontainer/backend/install-claude-skills.sh b/.devcontainer/backend/install-claude-skills.sh
index 71727e4d..a54f69e0 100755
--- a/.devcontainer/backend/install-claude-skills.sh
+++ b/.devcontainer/backend/install-claude-skills.sh
@@ -5,11 +5,10 @@ set -euo pipefail
 
 echo "Installing Claude Code skills (mattpocock/skills)..."
 
-claude plugin marketplace add mattpocock/skills
-claude plugin install skills@grill-me
-claude plugin install skills@to-prd
-claude plugin install skills@ubiquitous-language
-claude plugin install skills@tdd
-claude plugin install skills@improve-codebase-architecture
+npx skills@latest add --global --yes mattpocock/skills/grill-me
+npx skills@latest add --global --yes mattpocock/skills/to-prd
+npx skills@latest add --global --yes mattpocock/skills/ubiquitous-language
+npx skills@latest add --global --yes mattpocock/skills/tdd
+npx skills@latest add --global --yes mattpocock/skills/improve-codebase-architecture
 
 echo "Done. Available: /grill-me  /to-prd  /ubiquitous-language  /tdd  /improve-codebase-architecture"