diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 1b8b28a226..db724d6228 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -175,3 +175,10 @@ check_commit_msg:
     - git log -n10 --oneline ${PIPELINE_COMMIT_SHA}
     # commit start with "WIP: " need to be squashed before merge
     - 'git log --pretty=%s origin/master..${PIPELINE_COMMIT_SHA} -- | grep -i "^WIP:" && exit 1 || exit 0'
+
+check_test_scripts_build_test_rules:
+  extends:
+    - .pre_check_job_template
+    - .before_script_build_jobs
+  script:
+    - python tools/ci/check_build_test_rules.py check-test-scripts examples/ tools/test_apps components
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d9a476c8d7..39518b8017 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -149,6 +149,20 @@ repos:
         pass_filenames: false
         additional_dependencies:
           - pyparsing
+      - id: check-all-apps-readmes
+        name: Check if all apps readme files match given .build-test-rules.yml files. Modify the supported target tables
+        entry: tools/ci/check_build_test_rules.py check-readmes
+        language: python
+        files: 'tools/test_apps/.+|examples/.+|components/.+'
+        additional_dependencies:
+          - idf_build_apps
+      - id: sort-build-test-rules-ymls
+        name: sort .build-test-rules.yml files
+        entry: tools/ci/check_build_test_rules.py sort-yaml
+        language: python
+        files: '\.build-test-rules\.yml'
+        additional_dependencies:
+          - ruamel.yaml
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks: