diff --git a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
index 4711df000..11d9261f6 100644
--- a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
+++ b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update && \
 # install latest LLVM release
 RUN wget https://apt.llvm.org/llvm.sh && \
     chmod +x llvm.sh && \
-    ./llvm.sh 11 && \
+    ./llvm.sh 18 && \
     rm -rf llvm.sh && \
     # clean apt cache to reduce image size
     apt-get clean
@@ -49,9 +49,9 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
 # buildbot-worker. We deliberately do this after installing all the system
 # packages, as apt-get install breaks if we change the Python from default to
 # python3.8.
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100 ;\
-    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-11 100 ;\
-    update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/lld-11 100 ;\
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 ;\
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 ;\
+    update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/lld-18 100 ;\
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 100
 # Configure LLVM tools.
 ENV CC=clang
diff --git a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION
index f599e28b8..b4de39476 100644
--- a/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION
+++ b/buildbot/google/docker/buildbot-clangd-ubuntu-clang/VERSION
@@ -1 +1 @@
-10
+11
diff --git a/buildbot/google/terraform/deployment-clangd-ubuntu-clang.yaml b/buildbot/google/terraform/deployment-clangd-ubuntu-clang.yaml
index 3f6157918..e1eaa96a7 100644
--- a/buildbot/google/terraform/deployment-clangd-ubuntu-clang.yaml
+++ b/buildbot/google/terraform/deployment-clangd-ubuntu-clang.yaml
@@ -25,7 +25,7 @@ spec:
       - env:
         - name: BUILDBOT_PORT
           value: "9990" # 9990 is production, 9994 is staging.
-        image: gcr.io/sanitizer-bots/buildbot-clangd-ubuntu-clang:10
+        image: gcr.io/sanitizer-bots/buildbot-clangd-ubuntu-clang:11
         name: buildbot-clangd-ubuntu-clang
         resources:
           limits: