diff --git a/.clang-tidy b/.clang-tidy
index 57b34e79e8..8e18d3a749 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -2,7 +2,10 @@
 Checks:          'clang-diagnostic-*,clang-analyzer-*,boost-*,bugprone-*,
 performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,google-explicit-constructor,
 concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,
--readability-redundant-access-specifiers,-readability-qualified-auto'
+-readability-redundant-access-specifiers,-readability-qualified-auto,
+-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,
+-readability-convert-member-functions-to-static,-bugprone-easily-swappable-parameters,
+-cppcoreguidelines-pro-type-static-cast-downcast'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
diff --git a/.github/workflows/sub_lint.yml b/.github/workflows/sub_lint.yml
index 0de636c96c..c560d4aed2 100644
--- a/.github/workflows/sub_lint.yml
+++ b/.github/workflows/sub_lint.yml
@@ -77,7 +77,7 @@ on:
         type: boolean
         required: false
       cpplintFilters:
-        default: -build/c++17,-build/header_guard,-build/include,-build/include_alpha,-build/include_order,-build/include_subdir,-build/include_what_you_use,-build/namespaces,-legal/copyright,-readability/braces,-readability-braces-around-statements,-readability/casting,-readability/namespace,-readability/todo,-runtime/indentation_namespace,-runtime/int,-runtime/references,-whitespace/blank_line,-whitespace/braces,-whitespace/comma,-whitespace/comments,-whitespace/end_of_line,-whitespace/indent,-whitespace/line_length,-whitespace/newline,-whitespace/operators,-whitespace/parens,-whitespace/semicolon,-whitespace/tab,-whitespace/todo
+        default: -whitespace-*
         type: string
         required: false
       cpplintLineLength:
@@ -153,7 +153,7 @@ on:
         type: boolean
         required: false
       clazyChecks:
-        default: level1
+        default: level2,no-non-pod-global-static,no-copyable-polymorphic
         type: string
         required: false
       clazyFailSilent:
@@ -169,7 +169,7 @@ on:
         type: string
         required: false
       QT6Branch: # branch to check for QT6 Porting
-        default: master
+        default: main
         type: string
         required: false
       clazyQT6FailSilent: