diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 03ae77e..69ea827 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:bookworm-20250317
 RUN apt-get update
 RUN apt-get install -y \
     build-essential git checkinstall libssl-dev openssl software-properties-common \
-    cmake golang-go \
+    golang-go \
     python3.11 python3-pip python3.11-venv libsass-dev libcairo2 libpango-1.0-0 libpangoft2-1.0-0 pangocairo-1.0 pngquant \
     sudo
 
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index b4cf0a1..010d152 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -8,3 +8,8 @@ does not yet include the build tools.
 - C/C++ -  For building the project itself
 - Docker-in-Docker - For the included integration tests
 - Python/MkDocs - for the project site and documentation development
+
+
+## Credits
+
+- For MkDocs stack - [hitsumabushi845/MkDocs-with-Remote-Containers](https://github.com/hitsumabushi845/MkDocs-with-Remote-Containers)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 97ae144..b6375ab 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,4 +1,4 @@
-// Credits - https://github.com/hitsumabushi845/MkDocs-with-Remote-Containers
+// See the README for details
 {
     "name": "Testcontainers Native Development",
     "dockerFile": "Dockerfile",
@@ -6,6 +6,13 @@
         "ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {
             "version": "latest",
             "moby": true
+        },
+        "ghcr.io/devcontainers-extra/features/cmake:1": {
+            "version": "3.31.9"
+        },
+        "ghcr.io/msclock/features/vcpkg:2": {
+            "version": "stable",
+            "vcpkgAutoUpdate": true
         }
     },
     "customizations": {
@@ -21,7 +28,7 @@
           "ms-vscode.cmake-tools",
           "ms-vscode.makefile-tools",
           "ms-vscode.cpptools-extension-pack",
-          "ms-azuretools.vscode-docker",
+          "cschlosser.doxdocgen",
           // Golang development
           "golang.go",
           // Generic site and documentation development
@@ -32,7 +39,9 @@
           "oderwat.indent-rainbow",
           "msjsdiag.debugger-for-chrome",
           // GitHub Actions
-          "github.vscode-github-actions"
+          "github.vscode-github-actions",
+          // Containers
+          "ms-azuretools.vscode-docker"
         ],
       },
     },