diff --git a/Dockerfile b/Dockerfile
index 7307107638321e735c5b22c03d299ef274fe6252..4d18a8a1c68b498f59c6d9c17abd75059b8c5b4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,14 +37,14 @@ RUN git clone --depth 1 --branch 2.7 https://github.com/danmar/cppcheck.git
 RUN cd cppcheck && make install FILESDIR=/usr/share/cppcheck
 RUN rm -rf cppcheck
 
-# clang-format and clang-tidy v14.0.0
+# clang-format and clang-tidy v18.0.0
 RUN apt-get install -y software-properties-common
 RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-RUN add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main'
-RUN apt-get install -y clang-format-14
-RUN apt-get install -y clang-tidy-14
-RUN ln -s /usr/bin/clang-format-14 /usr/bin/clang-format
-RUN ln -s /usr/bin/clang-tidy-14 /usr/bin/clang-tidy
+RUN add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main'
+RUN apt-get install -y clang-format-18
+RUN apt-get install -y clang-tidy-18
+RUN ln -s /usr/bin/clang-format-18 /usr/bin/clang-format
+RUN ln -s /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
 
 # Doxygen v1.10.0
 RUN wget https://github.com/doxygen/doxygen/releases/download/Release_1_10_0/doxygen-1.10.0.linux.bin.tar.gz
diff --git a/README.md b/README.md
index 93ea557b9f581ff74d9cc10f62ac75e02c2d4d7e..8b99b5bb660f7638f35aadd7f1db652bb36ffb89 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This image includes the following tools:
 - Ninja v1.11.1
 - Ccache v4.9.1
 - Cppcheck v2.7
-- clang-format v14.0.0
-- clang-tidy v14.0.0
+- clang-format v18.0.0
+- clang-tidy v18.0.0
 - Doxygen v1.10.0
 - python3 v3.10