diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index 3a113f2bfa..1a4bd4e44c 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -293,6 +293,7 @@ build_docs_pdf:
   needs:
     - job: fast_template_app
       artifacts: false
+      optional: true
   script:
     - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
     - rm -rf test_build_system
@@ -319,6 +320,18 @@ test_build_system_cmake_macos:
     - macos_shell
   variables:
     SHELL_TEST_SCRIPT: test_build_system_cmake.sh
+  script:
+    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
+    - rm -rf test_build_system
+    - mkdir test_build_system
+    - cd test_build_system
+    # copy-paste the script from .test_build_system_template
+    # since `ESP_IDF_TEMPLATE_GIT` is a group variable and has higher precedence than job variable
+    # export here to override the group variable
+    #
+    # Clone the template app from github for macos runners
+    - export ESP_IDF_TEMPLATE_GIT="https://github.com/espressif/esp-idf-template.git"
+    - ${IDF_PATH}/tools/ci/${SHELL_TEST_SCRIPT}
 
 build_docker:
   extends: