diff --git a/Dockerfile.all b/Dockerfile.all
index 509eb2f..5cfe108 100644
--- a/Dockerfile.all
+++ b/Dockerfile.all
@@ -18,7 +18,7 @@ RUN set -e \
         apt-get --no-install-recommends -y install clang-format-$CLANG_VERSION clang-tidy-$CLANG_VERSION; done \
     && rm -rf /var/lib/apt/lists/*
 
-ENV CLANG_VERSIONS="20 19 18 17 16 15 14 13"
+ENV CLANG_VERSIONS="21 20 19 18 17 16 15 14 13"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -33,7 +33,7 @@ RUN set -e \
     && rm llvm.sh \
     && rm -rf /var/lib/apt/lists/*
 
-ENV CLANG_VERSIONS="20 19 18 17 16 15 14 13 12 11 10 9"
+ENV CLANG_VERSIONS="21 20 19 18 17 16 15 14 13 12 11 10 9"
 # Integrity testing
 RUN set -e \
     && for VERSION in $CLANG_VERSIONS; do \
diff --git a/README.md b/README.md
index 1aefee2..3329603 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,9 @@ You can access all available  Clang Tools Docker images via [Docker Hub registry
 
 ## Supported Tags and Dockerfile links
 
-* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supports versions of clang-tools includes `20`, `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
+* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supports versions of clang-tools includes `21`, `20`, `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
+* [`21`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
+* [`21-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
 * [`20`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
 * [`20-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
 * [`19`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 023ae91..1bce355 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,6 +2,8 @@
 group "default" {
   targets = [
     "all",
+    "21",
+    "21-alpine",
     "20",
     "20-alpine",
     "19",
@@ -50,14 +52,14 @@ target "all" {
 
 target "clang-tools" {
   matrix = {
-    tgt = ["20"]
+    tgt = ["21"]
   }
   name = "${tgt}"
   dockerfile = "Dockerfile"
   context = "."
   args = {
-    # https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-20&searchon=names
-    BASE_IMAGE="ubuntu:plucky"
+    # https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-21&searchon=names
+    BASE_IMAGE="ubuntu:questing"
     CLANG_VERSION="${tgt}",
   }
   tags = [
@@ -70,14 +72,14 @@ target "clang-tools" {
 
 target "clang-tools" {
   matrix = {
-    tgt = ["19"]
+    tgt = ["20", "19"]
   }
   name = "${tgt}"
   dockerfile = "Dockerfile"
   context = "."
   args = {
-    # https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-19&searchon=names
-    BASE_IMAGE="ubuntu:oracular"
+    # https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-20&searchon=names
+    BASE_IMAGE="ubuntu:plucky"
     CLANG_VERSION="${tgt}",
   }
   tags = [
@@ -90,7 +92,7 @@ target "clang-tools" {
 
 target "clang-tools" {
   matrix = {
-    tgt = ["18"]
+    tgt = ["18", "17", "16", "15", "14"]
   }
   name = "${tgt}"
   dockerfile = "Dockerfile"
@@ -108,25 +110,6 @@ target "clang-tools" {
   output = ["type=image"]
 }
 
-target "clang-tools" {
-  matrix = {
-    tgt = ["17", "16", "15", "14"]
-  }
-  name = "${tgt}"
-  dockerfile = "Dockerfile"
-  context = "."
-  args = {
-    BASE_IMAGE="ubuntu:24.10"
-    CLANG_VERSION="${tgt}",
-  }
-  tags = [
-    "${DOCKER_REPO}:${tgt}",
-    "${GITHUB_REPO}:${tgt}"
-  ]
-  platforms = ["linux/amd64", "linux/arm64"]
-  output = ["type=image"]
-}
-
 target "clang-tools" {
   matrix = {
     tgt = ["13", "12", "11"]
@@ -167,7 +150,7 @@ target "clang-tools" {
 
 target "clang-tools" {
   matrix = {
-    tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine"]
+    tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine", "21-alpine"]
   }
   name = "${tgt}"
   dockerfile = "Dockerfile.alpine"