diff --git a/src/cpp-mariadb/.devcontainer/Dockerfile b/src/cpp-mariadb/.devcontainer/Dockerfile
index fab07762..cf32009b 100644
--- a/src/cpp-mariadb/.devcontainer/Dockerfile
+++ b/src/cpp-mariadb/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/cpp:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant}
 
 # Everything below this is needed for installing MariaDB
 # Instructions are copied and modified from: https://mariadb.com/docs/clients/mariadb-connectors/connector-cpp/install/
diff --git a/src/cpp-mariadb/README.md b/src/cpp-mariadb/README.md
index 1b8b9ee8..38e0458d 100644
--- a/src/cpp-mariadb/README.md
+++ b/src/cpp-mariadb/README.md
@@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 |
+| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-13 |
 | reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
diff --git a/src/cpp-mariadb/devcontainer-template.json b/src/cpp-mariadb/devcontainer-template.json
index 52f4868d..7cd969a4 100644
--- a/src/cpp-mariadb/devcontainer-template.json
+++ b/src/cpp-mariadb/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "cpp-mariadb",
-    "version": "3.0.3",
+    "version": "4.0.0",
     "name": "C++ & MariaDB",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp-mariadb",
@@ -9,14 +9,14 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
+            "description": "Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
             "proposals": [
+				"debian-13",
                 "debian-12",
-                "debian-11",
                 "ubuntu-24.04",
                 "ubuntu-22.04"
             ],
-            "default": "debian-11"
+            "default": "debian-13"
         },
         "reinstallCmakeVersionFromSource": {
             "type": "string",
diff --git a/src/cpp/.devcontainer/Dockerfile b/src/cpp/.devcontainer/Dockerfile
index c105b812..9e96c66c 100644
--- a/src/cpp/.devcontainer/Dockerfile
+++ b/src/cpp/.devcontainer/Dockerfile
@@ -1,5 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/cpp:1-${templateOption:imageVariant}
-
+FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant}
 ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="${templateOption:reinstallCmakeVersionFromSource}"
 
 # Optionally install the cmake for vcpkg
diff --git a/src/cpp/README.md b/src/cpp/README.md
index c2a7000c..d3855abb 100644
--- a/src/cpp/README.md
+++ b/src/cpp/README.md
@@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 |
+| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-13 |
 | reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
diff --git a/src/cpp/devcontainer-template.json b/src/cpp/devcontainer-template.json
index 569f63c6..9f9221ac 100644
--- a/src/cpp/devcontainer-template.json
+++ b/src/cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "cpp",
-    "version": "3.0.3",
+    "version": "4.0.0",
     "name": "C++",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp",
@@ -9,14 +9,14 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
+            "description": "Debian / Ubuntu version (use Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
             "proposals": [
+				"debian-13",
                 "debian-12",
-                "debian-11",
                 "ubuntu-24.04",
                 "ubuntu-22.04"
             ],
-            "default": "debian-11"
+            "default": "debian-13"
         },
         "reinstallCmakeVersionFromSource": {
             "type": "string",