diff --git a/README.md b/README.md
index af58c32..29ec6fe 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 `21`, `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 `22`, `21`, `20`, `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`)
+* [`22`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
+* [`22-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
 * [`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)
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 1bce355..25ae9af 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,6 +2,8 @@
 group "default" {
   targets = [
     "all",
+    "22",
+    "22-alpine",
     "21",
     "21-alpine",
     "20",
@@ -50,6 +52,26 @@ target "all" {
   output = ["type=image"]
 }
 
+target "clang-tools" {
+  matrix = {
+    tgt = ["22"]
+  }
+  name = "${tgt}"
+  dockerfile = "Dockerfile"
+  context = "."
+  args = {
+    # https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-22&searchon=names
+    BASE_IMAGE="ubuntu:resolute"
+    CLANG_VERSION="${tgt}",
+  }
+  tags = [
+    "${DOCKER_REPO}:${tgt}",
+    "${GITHUB_REPO}:${tgt}"
+  ]
+  platforms = ["linux/amd64", "linux/arm64"]
+  output = ["type=image"]
+}
+
 target "clang-tools" {
   matrix = {
     tgt = ["21"]
@@ -150,7 +172,7 @@ target "clang-tools" {
 
 target "clang-tools" {
   matrix = {
-    tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine", "21-alpine"]
+    tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine", "21-alpine", "22-alpine"]
   }
   name = "${tgt}"
   dockerfile = "Dockerfile.alpine"