diff --git a/.devcontainer/cpp/Dockerfile b/.devcontainer/cpp/Dockerfile
index 0cff624b..2e6062b1 100644
--- a/.devcontainer/cpp/Dockerfile
+++ b/.devcontainer/cpp/Dockerfile
@@ -85,9 +85,9 @@ EOF
 # Final development container image
 FROM ${BASE_IMAGE}
 
-ARG CLANG_VERSION=20
+ARG CLANG_VERSION=21
 ARG CPM_VERSION=0.42.1
-ARG INCLUDE_WHAT_YOU_USE_VERSION=0.24
+ARG INCLUDE_WHAT_YOU_USE_VERSION=0.25
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/.devcontainer/cpp/apt-requirements-clang.json b/.devcontainer/cpp/apt-requirements-clang.json
index 6ed14786..5a3398e2 100644
--- a/.devcontainer/cpp/apt-requirements-clang.json
+++ b/.devcontainer/cpp/apt-requirements-clang.json
@@ -1,11 +1,11 @@
 {
-  "clang-20": "1:20.1.8-2ubuntu8",
-  "clangd-20": "1:20.1.8-2ubuntu8",
-  "clang-format-20": "1:20.1.8-2ubuntu8",
-  "clang-tidy-20": "1:20.1.8-2ubuntu8",
-  "clang-tools-20": "1:20.1.8-2ubuntu8",
-  "libclang-rt-20-dev": "1:20.1.8-2ubuntu8",
-  "lld-20": "1:20.1.8-2ubuntu8",
-  "llvm-20": "1:20.1.8-2ubuntu8",
-  "mull-20": "0.34.0"
+  "clang-21": "1:21.1.8-6ubuntu1",
+  "clangd-21": "1:21.1.8-6ubuntu1",
+  "clang-format-21": "1:21.1.8-6ubuntu1",
+  "clang-tidy-21": "1:21.1.8-6ubuntu1",
+  "clang-tools-21": "1:21.1.8-6ubuntu1",
+  "libclang-rt-21-dev": "1:21.1.8-6ubuntu1",
+  "lld-21": "1:21.1.8-6ubuntu1",
+  "llvm-21": "1:21.1.8-6ubuntu1",
+  "mull-21": "0.34.0"
 }