diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index ec46346531..f306912b34 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -7,8 +7,8 @@
   - "tools/ci/static-analysis-rules.yml"
   - "tools/ci/clang_tidy_dirs.txt"
 
-  - "**/*.{c,C}"
-  - "**/*.{h,H}"
+  - "**/*.{c,C,cpp}"
+  - "**/*.{h,H,hpp}"
   - "components/**/Kconfig"
   - "components/**/CMakeList.txt"
 
diff --git a/.gitlab/ci/static-code-analysis.yml b/.gitlab/ci/static-code-analysis.yml
index 55ee95cf3e..21189b1dc5 100644
--- a/.gitlab/ci/static-code-analysis.yml
+++ b/.gitlab/ci/static-code-analysis.yml
@@ -3,7 +3,6 @@ clang_tidy_check:
   extends:
     - .pre_check_template
     - .rules:patterns:clang_tidy
-  image: ${CLANG_STATIC_ANALYSIS_IMAGE}
   artifacts:
     paths:
       - $OUTPUT_DIR
@@ -13,6 +12,7 @@ clang_tidy_check:
     CLANG_TIDY_DIRS_TXT: ${CI_PROJECT_DIR}/tools/ci/clang_tidy_dirs.txt
     RULES_FILE: ${CI_PROJECT_DIR}/tools/ci/static-analysis-rules.yml
     OUTPUT_DIR: ${CI_PROJECT_DIR}/clang_tidy_reports
+    IDF_TOOLCHAIN: clang
   script:
     - internal_pip_install $CLANG_TIDY_RUNNER_PROJ pyclang
     - export PATH=$PATH:$(python -c "import sys; print(sys.executable.rsplit('/', 1)[0])")
@@ -21,7 +21,7 @@ clang_tidy_check:
       --output-path ${OUTPUT_DIR}
       --limit-file ${RULES_FILE}
       --xtensa-include-dir
-      --run-clang-tidy-py ${RUN_CLANG_TIDY_PY}
+      --run-clang-tidy-py run-clang-tidy
 
 check_pylint:
   extends:
diff --git a/tools/ci/static-analysis-rules.yml b/tools/ci/static-analysis-rules.yml
index 97073f5e70..f4555f31b4 100644
--- a/tools/ci/static-analysis-rules.yml
+++ b/tools/ci/static-analysis-rules.yml
@@ -38,4 +38,6 @@ skip:
   - "components/bt/host/bluedroid/stack/btm/btm_dev.c"
   - "components/bt/host/bluedroid/stack/gatt/att_protocol.c"
   - "components/bt/host/bluedroid/stack/gatt/gatt_db.c"
+  - "components/bt/host/bluedroid/stack/l2cap/l2c_utils.c"
   - "components/wifi_provisioning/src/scheme_ble.c"
+  - "components/wpa_supplicant/src/rsn_supp/wpa.c"