diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ca51ad..38b8237 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,58 +7,23 @@ version: 2
 updates:
   # https://github.com/dependabot/dependabot-core/issues/2178
   - package-ecosystem: "docker"
-    directory: "all/"
+    directory: /
     schedule:
       interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "16/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "15/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "14/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "13/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "12-alpine-3.18/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "12/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "11-alpine-3.18/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "11/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "10/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "9/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "8/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "7/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "6/"
+    reviewers:
+      - "shenxianpeng"
+    groups:
+      pip:
+        patterns:
+          - "*"
+
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
       interval: "weekly"
+    reviewers:
+      - "shenxianpeng"
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/Dockerfile.all b/Dockerfile.all
index a7ea2da..1607e8c 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="17 16 15 14 13"
+ENV CLANG_VERSIONS="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="17 16 15 14 13 12 11 10 9"
+ENV CLANG_VERSIONS="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 c94c1db..0eb2ccc 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@ You can find all the clang-tools Docker images on Docker Hub [registry](https://
 
 ## Supported tags and respective `Dockerfile` links
 
-* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supported versions of clang-tools includes `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
+* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supported versions of clang-tools includes `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
+* [`18`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
 * [`17`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
 * [`16`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
 * [`16-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 880a40f..fc70ebc 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,6 +2,7 @@
 group "default" {
   targets = [
     "all",
+    "18",
     "17",
     "16",
     "16-alpine",
@@ -42,7 +43,7 @@ target "all" {
 
 target "clang-tools" {
   matrix = {
-    tgt = ["17", "16", "15", "14", "13"]
+    tgt = ["18", "17", "16", "15", "14", "13"]
   }
   name = "${tgt}"
   dockerfile = "Dockerfile"