diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3cf1717a..46934639 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -92,8 +92,10 @@ jobs:
           files: |
             **.cpp
             **.hpp
+      - name: Install clang tidy 18
+        run: sudo apt install clang-tidy-18
       - if: ${{ steps.changed-cpp-files.outputs.all_changed_files != '' }}
-        run: run-clang-tidy -j $(nproc --all) -p build/ -export-fixes clang-tidy-fixes.yaml -config "$(cat src/fuse/.clang-tidy)" ${{ steps.changed-cpp-files.outputs.all_changed_files }}
+        run: run-clang-tidy -j $(nproc --all) -p build/ -export-fixes clang-tidy-fixes.yaml -config "$(cat src/fuse/.clang-tidy)" -clang-tidy-binary clang-tidy-18 ${{ steps.changed-cpp-files.outputs.all_changed_files }}
         working-directory: /colcon_ws
       - uses: asarium/clang-tidy-action@v1.0
         with:
diff --git a/Dockerfile b/Dockerfile
index f79eed54..6ab94b46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,14 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
       clang-tidy \
       python3-vcstool \
       # use cyclonedds instead of fastdds
-      ros-humble-rmw-cyclonedds-cpp
+      ros-humble-rmw-cyclonedds-cpp \
+      software-properties-common
+
+# install latest clang stuff
+RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    clang-tidy-18
 
 # Create the colcon ws. For now, copy the source files into the workspace
 # so that we don't have to deal with cloning this repo, which is private.