diff --git a/CMLibCodeAnalysisClangAnalyze.cmake b/CMLibCodeAnalysisClangAnalyze.cmake
index d84db7a..a0ab089 100644
--- a/CMLibCodeAnalysisClangAnalyze.cmake
+++ b/CMLibCodeAnalysisClangAnalyze.cmake
@@ -1,4 +1,12 @@
-find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check)
+find_program(
+  CLANG_CHECK_EXE
+  NAMES
+    clang-check-13
+    clang-check-12
+    clang-check-11
+    clang-check-10
+    clang-check-9
+    clang-check)
 if(CLANG_CHECK_EXE)
   option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
 endif()
diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake
index 6751f29..4116cbd 100644
--- a/CMLibCodeAnalysisClangTidy.cmake
+++ b/CMLibCodeAnalysisClangTidy.cmake
@@ -1,4 +1,12 @@
-find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy)
+find_program(
+  CLANG_TIDY_EXE
+  NAMES
+    clang-tidy-13
+    clang-tidy-12
+    clang-tidy-11
+    clang-tidy-10
+    clang-tidy-9
+    clang-tidy)
 if(CLANG_TIDY_EXE)
   option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
 endif()
diff --git a/CMLibCodeAnalysisClazy.cmake b/CMLibCodeAnalysisClazy.cmake
index 2090dbb..788df68 100644
--- a/CMLibCodeAnalysisClazy.cmake
+++ b/CMLibCodeAnalysisClazy.cmake
@@ -1,5 +1,12 @@
-find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES clang-apply-replacements-10 clang-apply-replacements-9
-                                                clang-apply-replacements)
+find_program(
+  CLANG_APPLY_REPLACEMENTS_EXE
+  NAMES
+    clang-apply-replacements-13
+    clang-apply-replacements-12
+    clang-apply-replacements-11
+    clang-apply-replacements-10
+    clang-apply-replacements-9
+    clang-apply-replacements)
 
 find_program(CLAZY_EXE NAMES clazy-standalone)