diff --git a/.clang-tidy b/.clang-tidy
index 08f61e90..e8d5d768 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,17 +1,6 @@
 Checks: >
   bugprone-*,
-  cert-dcl50-cpp,
-  cert-dcl58-cpp,
-  cert-env33-c,
-  cert-err34-c,
-  cert-err52-cpp,
-  cert-err60-cpp,
-  cert-flp30-c,
-  cert-mem57-cpp,
-  cert-msc50-cpp,
-  cert-msc51-cpp,
-  cert-oop57-cpp,
-  cert-oop58-cpp,
+  cert-*,
   clang-*,
   concurrency-*,
   cppcoreguidelines-*,
@@ -28,6 +17,7 @@ Checks: >
   -bugprone-casting-through-void,
   -bugprone-easily-swappable-parameters,
   -bugprone-throwing-static-initialization,
+  -cert-err58-cpp,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-non-private-member-variables-in-classes,
   -cppcoreguidelines-owning-memory,
@@ -41,7 +31,6 @@ Checks: >
   -misc-use-internal-linkage,
   -modernize-use-trailing-return-type,
   -portability-avoid-pragma-once,
-  -portability-template-virtual-member-function,
   -readability-inconsistent-ifelse-braces,
   -readability-magic-numbers