diff --git a/.clang-tidy b/.clang-tidy
index 74d1c6cf5890e3d921b5f8c075c9bdaf1dd6c437..fffab0ce372641ebabd3468a5c106d2c9b0ce039 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -63,6 +63,7 @@ performance-*,
 -performance-move-const-arg,
 -performance-unnecessary-value-param,
 -performance-avoid-endl,
+-performance-no-int-to-ptr,
 
 portability-*,
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ee46ddc0af7fd8dfd8e859d18ce0bce05e4184d..0e0cc1e1663f63a62f275ff9cc7aaae5440b51a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2035,24 +2035,23 @@ doc:
 ##                                                                           ##
 ###############################################################################
 
-#clang-tidy:
-#   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
-#   script:
-#      - $CXX --version
-#      - clang-tidy -version
-#      - cmake --version
-#      - mkdir $CI_PROJECT_DIR/build
-#      - 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
-#      - utilities/filterCompileCommands.py compile_commands.json
-#      - wget https://raw.githubusercontent.com/llvm/llvm-project/main/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-#      - python3 run-clang-tidy.py -quiet | tee clang-tidy-output.txt
-#   artifacts:
-#      paths:
-#         - $CI_PROJECT_DIR/build/clang-tidy-output.txt
-#   tags:
-#      - docker
+clang-tidy:
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17
+   script:
+      - $CXX --version
+      - clang-tidy -version
+      - cmake --version
+      - mkdir $CI_PROJECT_DIR/build
+      - 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
+      - utilities/filterCompileCommands.py compile_commands.json
+      - run-clang-tidy -quiet | tee clang-tidy-output.txt
+   artifacts:
+      paths:
+         - $CI_PROJECT_DIR/build/clang-tidy-output.txt
+   tags:
+      - docker
 
 
 cppcheck:
diff --git a/src/core/OpenMP.h b/src/core/OpenMP.h
index b8ae3d6077ea8e5467fa84deecc959f5be80bb4c..5e454f37fdf463a117c17d0711ecd2901c5e4fb1 100644
--- a/src/core/OpenMP.h
+++ b/src/core/OpenMP.h
@@ -131,7 +131,7 @@ inline int   omp_get_num_teams (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
 inline int   omp_get_team_num (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
 inline int   omp_get_cancellation (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
 
-#   include <stdlib.h>
+#   include <stdlib.h> // NOLINT(modernize-deprecated-headers)
 /* OpenMP 4.5 */
 inline int    omp_get_initial_device (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
 inline void*  omp_target_alloc(size_t, int) { WALBERLA_OPENMP_FUNCTION_ERROR }