diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index dd037e5dd7..1d61eaec56 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -727,10 +727,11 @@ build_clang_test_apps_esp32c6:
   stage: host_test
   extends:
     - .build_template
-    - .rules:build
+    - .rules:build:check
   needs:
     - job: fast_template_app
       artifacts: false
+      optional: true
   script:
     - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
     - rm -rf test_build_system
diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 4aba4857bd..156f1b9cf8 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -25,6 +25,7 @@
     - downloadable-tools
   included_in:
     - build:target_test
+    - build:check
 
 # -------------------
 # Specific Build Jobs
@@ -46,9 +47,24 @@
     - macos_test  # for backward compatibility
   patterns:
     - build_system
-    - macos
+    - build_macos
     - downloadable-tools
 
+# ---------------------------
+# Add patterns to build rules
+# ---------------------------
+"patterns:template-app":
+  patterns:
+    - build_template-app
+  included_in:
+    - build:target_test
+
+"patterns:build-check":
+  patterns:
+    - build_check
+  included_in:
+    - build:check
+
 # ---------------
 # Build Test Jobs
 # ---------------
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 0680e1f821..a15b7570bd 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -84,7 +84,9 @@ test_check_kconfigs:
     - python ${IDF_PATH}/tools/ci/test_check_kconfigs.py
 
 check_blobs:
-  extends: .pre_check_template
+  extends:
+    - .pre_check_template
+    - .rules:build:check
   variables:
     SUBMODULES_TO_FETCH: "components/esp_wifi/lib;components/esp_phy/lib;components/esp_coex/lib"
   script:
@@ -109,7 +111,7 @@ check_blobs:
 check_public_headers:
   extends:
     - .pre_check_template
-    - .rules:build
+    - .rules:build:check
   script:
     - IDF_TARGET=esp32 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
     - IDF_TARGET=esp32s2 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s2-elf-
@@ -122,7 +124,7 @@ check_public_headers:
 check_chip_support_components:
   extends:
     - .pre_check_template
-    - .rules:build
+    - .rules:build:check
   artifacts:
     when: on_failure
     paths:
@@ -137,7 +139,7 @@ check_chip_support_components:
 check_esp_err_to_name:
   extends:
     - .pre_check_template
-    - .rules:build
+    - .rules:build:check
   artifacts:
     when: on_failure
     paths:
@@ -183,6 +185,7 @@ check_configure_ci_environment_parsing:
   extends:
     - .pre_check_template
     - .before_script_build_jobs
+    - .rules:build
   script:
     - cd tools/ci
     - python -m unittest ci_build_apps.py
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 436aada638..0246b5d992 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -45,6 +45,9 @@
   - "tools/idf_tools.py"
   - "tools/tools.json"
 
+.patterns-build_template-app: &patterns-build_template-app
+  - "tools/ci/build_template_app.sh"
+
 .patterns-build_system: &patterns-build_system
   - "tools/cmake/**/*"
   - "tools/kconfig_new/**/*"
@@ -118,15 +121,28 @@
   - "tools/ci/python_packages/gitlab_api.py"
   - "tools/ci/integration_test/**/*"
 
+.patterns-build_macos: &patterns-build_macos
+  - "tools/ci/test_configure_ci_environment.sh"
+  - "tools/ci/test_build_system_cmake.sh"
+
+.patterns-build_check: &patterns-build_check
+  - "tools/test_build_system/**/*"
+  - "tools/ci/test_build_system_cmake.sh"
+  - "tools/ci/test_build_system_spaces.py"
+  - "tools/ci/test_configure_ci_environment.sh"
+  - "tools/gen_esp_err_to_name.py"
+  - "tools/ci/check_soc_headers_leak.py"
+  - "tools/ci/check_esp_memory_utils_headers.sh"
+  - "tools/ci/check_blobs.sh"
+  - "tools/ci/check_public_headers.py"
+
 .patterns-host_test: &patterns-host_test
   - ".gitlab/ci/host-test.yml"
 
   - "components/**/*"
 
   - "tools/ci/test_autocomplete.py"
-  - "tools/ci/test_build_system_cmake.sh"
   - "tools/ci/test_check_kconfigs.py"
-  - "tools/ci/test_configure_ci_environment.sh"
 
   - "tools/mass_mfg/**/*"
 
@@ -613,6 +629,21 @@
     - <<: *if-dev-push
       changes: *patterns-downloadable-tools
 
+.rules:build:check:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-dev-push
+      changes: *patterns-build_check
+    - <<: *if-dev-push
+      changes: *patterns-build_components
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-downloadable-tools
+
 .rules:build:component_ut:
   rules:
     - <<: *if-revert-branch
@@ -1470,6 +1501,8 @@
     - <<: *if-label-build
     - <<: *if-label-macos
     - <<: *if-label-macos_test
+    - <<: *if-dev-push
+      changes: *patterns-build_macos
     - <<: *if-dev-push
       changes: *patterns-build_system
     - <<: *if-dev-push
@@ -1525,6 +1558,8 @@
       changes: *patterns-build_components
     - <<: *if-dev-push
       changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-build_template-app
     - <<: *if-dev-push
       changes: *patterns-component_ut
     - <<: *if-dev-push
diff --git a/tools/ci/exclude_check_tools_files.txt b/tools/ci/exclude_check_tools_files.txt
index 3b54e2c58f..f529fc21d0 100644
--- a/tools/ci/exclude_check_tools_files.txt
+++ b/tools/ci/exclude_check_tools_files.txt
@@ -1,6 +1,5 @@
 tools/ble/**/*
 tools/catch/**/*
-tools/ci/build_template_app.sh
 tools/ci/check_*.py
 tools/ci/check_*.txt
 tools/ci/check_*.sh
@@ -36,7 +35,6 @@ tools/ci/utils.sh
 tools/eclipse-code-style.xml
 tools/format-minimal.sh
 tools/format.sh
-tools/gen_esp_err_to_name.py
 tools/mocks/**/*
 tools/set-submodules-to-github.sh
 tools/templates/sample_component/CMakeLists.txt