diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39797634be3a400e8f3b4312f09bd9a54bfecac6..cc3c33f17933b883f18186b9c6ee5811d1572930 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2037,7 +2037,7 @@ doc:
 ###############################################################################
 
 clang-tidy:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-18
    stage: "Code Quality"
    needs: []
    before_script:
@@ -2050,7 +2050,7 @@ clang-tidy:
       - cd $CI_PROJECT_DIR/build
       - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON -DWALBERLA_LOGLEVEL=DETAIL
       - cmake . -LA
-      - python3 utilities/clang-tidy/analyze.py -p utilities/clang-tidy/analyze.yml -c build/compile_commands.json -o build/clang-tidy-output
+      - python3 utilities/clang-tidy/analyze.py -p utilities/clang-tidy/analyze.yml -r $CI_PROJECT_DIR -c compile_commands.json -o clang-tidy-output
    artifacts:
       paths:
          - $CI_PROJECT_DIR/build/clang-tidy-output