diff --git a/.clang-tidy b/.clang-tidy
index e33d426873..b27df6d910 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,8 +1,10 @@
----
-Checks: "-*,
-         boost-*,
-         portability-*,
-"
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-FormatStyle: none
+Checks: >
+  -*,
+  boost-*,
+  portability-*,
+  clang-analyzer-*,
+  -clang-analyzer-optin*,
+  -clang-analyzer-cplusplus.NewDeleteLeaks,
+  -clang-analyzer-core.CallAndMessage
+WarningsAsErrors: true
+HeaderFilterRegex: '^(apps|components)'