diff --git a/cmake/clang_tidy.cmake b/cmake/clang_tidy.cmake
index 26f485c82e5fd67c900c595cdb4d2eb4554f8762..d150b06b42e8f5e74c66f264157e05d94a99a3dc 100644
--- a/cmake/clang_tidy.cmake
+++ b/cmake/clang_tidy.cmake
@@ -23,21 +23,17 @@ if(libClaPP_CLANG_TIDY_BIN)
     list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -misc-non-private-member-variables-in-classes)
     list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -cppcoreguidelines-non-private-member-variables-in-classes)
     list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -llvm-include-order)
-
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0.0")
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -hicpp-use-equals-default)
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -modernize-use-equals-default)
-    endif()
-
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0")
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -llvmlibc-*)
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -misc-no-recursion)
-    endif()
-
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "13.0.0")
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -altera-unroll-loops)
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -altera-id-dependent-backward-branch)
-    endif()
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -cppcoreguidelines-avoid-const-or-ref-data-members)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -llvmlibc-*)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -misc-no-recursion)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -misc-include-cleaner)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -cppcoreguidelines-avoid-do-while)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -altera-unroll-loops)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -altera-id-dependent-backward-branch)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -bugprone-unchecked-optional-access)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -cppcoreguidelines-missing-std-forward)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -misc-const-correctness)
+    list(APPEND libClaPP_CLANG_TIDY_CHECKS_LIST -readability-function-cognitive-complexity)
 
     set(libClaPP_CLANG_TIDY_CHECKS ${libClaPP_CLANG_TIDY_CHECKS_LIST})
     string(REPLACE ";" "," libClaPP_CLANG_TIDY_CHECKS "${libClaPP_CLANG_TIDY_CHECKS}")
@@ -76,10 +72,6 @@ if(libClaPP_CLANG_TIDY_BIN)
     list(APPEND libClaPP_CLANG_TIDY_CHECKS_GTEST_LIST -hicpp-special-member-functions)
     list(APPEND libClaPP_CLANG_TIDY_CHECKS_GTEST_LIST -llvm-header-guard)
 
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0.0")
-        list(APPEND libClaPP_CLANG_TIDY_CHECKS_GTEST_LIST -readability-function-cognitive-complexity)
-    endif()
-
     set(libClaPP_CLANG_TIDY_CHECKS_GTEST ${libClaPP_CLANG_TIDY_CHECKS_GTEST_LIST})
     string(REPLACE ";" "," libClaPP_CLANG_TIDY_CHECKS_GTEST "${libClaPP_CLANG_TIDY_CHECKS_GTEST}")