diff --git a/.devcontainer/claude-sandbox/devcontainer.json b/.devcontainer/claude-sandbox/devcontainer.json
index 4609482..c62ed6d 100644
--- a/.devcontainer/claude-sandbox/devcontainer.json
+++ b/.devcontainer/claude-sandbox/devcontainer.json
@@ -23,6 +23,7 @@
         // **General**
         "redhat.vscode-yaml",
         "bierner.markdown-preview-github-styles",
+        "bierner.markdown-mermaid",
         "ms-azuretools.vscode-docker"
       ],
       "settings": {
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index dd06dda..931e2f7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,6 +23,8 @@
         "redhat.vscode-yaml",
         // Markdown Preview Github Styles - Markdown preview
         "bierner.markdown-preview-github-styles",
+        // Markdown Preview Mermaid Support - Mermaid diagrams
+        "bierner.markdown-mermaid",
         // Docker - Dockerfile support
         "ms-azuretools.vscode-docker"
       ],
diff --git a/claude-code/.devcontainer/claude-sandbox/devcontainer.json b/claude-code/.devcontainer/claude-sandbox/devcontainer.json
index 8067bde..729fb32 100644
--- a/claude-code/.devcontainer/claude-sandbox/devcontainer.json
+++ b/claude-code/.devcontainer/claude-sandbox/devcontainer.json
@@ -42,6 +42,8 @@
         "redhat.vscode-yaml",
         // Markdown Preview Github Styles - renders Markdown preview with GitHub's CSS
         "bierner.markdown-preview-github-styles",
+        // Markdown Preview Mermaid Support - renders Mermaid diagrams in Markdown preview
+        "bierner.markdown-mermaid",
         // Docker - Dockerfile and Compose syntax, linting, and image management
         "ms-azuretools.vscode-docker",
 
diff --git a/claude-code/.devcontainer/devcontainer.json b/claude-code/.devcontainer/devcontainer.json
index 1fe25bf..8215a2b 100644
--- a/claude-code/.devcontainer/devcontainer.json
+++ b/claude-code/.devcontainer/devcontainer.json
@@ -40,6 +40,8 @@
         "redhat.vscode-yaml",
         // Markdown Preview Github Styles - renders Markdown preview with GitHub's CSS
         "bierner.markdown-preview-github-styles",
+        // Markdown Preview Mermaid Support - renders Mermaid diagrams in Markdown preview
+        "bierner.markdown-mermaid",
         // Docker - Dockerfile and Compose syntax, linting, and image management
         "ms-azuretools.vscode-docker",