diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 536355fd3..df6d2c377 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,8 +120,17 @@ before_script:
   dependencies: []
   before_script:
     - *apply_bot_filter
+    - $IDF_PATH/tools/idf_tools.py install-python-env
+    # On macOS, these tools need to be installed
+    - $IDF_PATH/tools/idf_tools.py --non-interactive install cmake ninja
+    # This adds tools (compilers) and the version-specific Python environment to PATH
     - *setup_tools_unless_target_test
+    # Install packages required by CI scripts into IDF Python environment
+    - pip install -r $IDF_PATH/tools/ci/python_packages/ttfw_idf/requirements.txt
     - source tools/ci/configure_ci_environment.sh
+    # Part of tools/ci/setup_python.sh; we don't use pyenv on macOS, so can't run the rest of the script.
+    - export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
+    - *fetch_submodules
 
 include:
   - '/tools/ci/config/pre_check.yml'
diff --git a/components/efuse/src/esp_efuse_utility.c b/components/efuse/src/esp_efuse_utility.c
index 108cba17e..06a800c0f 100644
--- a/components/efuse/src/esp_efuse_utility.c
+++ b/components/efuse/src/esp_efuse_utility.c
@@ -178,6 +178,7 @@ void esp_efuse_utility_update_virt_blocks(void)
 }
 
 // Prints efuse values for all registers.
+#ifndef BOOTLOADER_BUILD
 void esp_efuse_utility_debug_dump_blocks(void)
 {
     printf("EFUSE_BLKx:\n");
@@ -201,6 +202,7 @@ void esp_efuse_utility_debug_dump_blocks(void)
 #endif
     printf("\n");
 }
+#endif // BOOTLOADER_BUILD
 
 // returns the number of array elements for placing these bits in an array with the length of each element equal to size_of_base.
 int esp_efuse_utility_get_number_of_items(int bits, int size_of_base)
diff --git a/tools/ci/build_examples_cmake.sh b/tools/ci/build_examples_cmake.sh
index fc8089b65..8205aa17f 100755
--- a/tools/ci/build_examples_cmake.sh
+++ b/tools/ci/build_examples_cmake.sh
@@ -60,7 +60,6 @@ BUILD_PATH=$(${REALPATH} --relative-to ${IDF_PATH} ${BUILD_PATH})
 
 ALL_BUILD_LIST_JSON="${BUILD_PATH}/list.json"
 JOB_BUILD_LIST_JSON="${BUILD_PATH}/list_job_${CI_NODE_INDEX}.json"
-mkdir -p "${BUILD_PATH}/example_builds"
 
 echo "build_examples running for target $IDF_TARGET"
 
@@ -80,7 +79,7 @@ ${IDF_PATH}/tools/find_apps.py examples \
     --exclude examples/build_system/idf_as_lib \
     --work-dir "${BUILD_PATH}/@f/@w/@t" \
     --build-dir build \
-    --build-log "${LOG_PATH}/@f.txt" \
+    --build-log "${LOG_PATH}/@f_@w.txt" \
     --output ${ALL_BUILD_LIST_JSON} \
     --config 'sdkconfig.ci=default' \
     --config 'sdkconfig.ci.*=' \
diff --git a/tools/find_build_apps/cmake.py b/tools/find_build_apps/cmake.py
index 8668eb218..b82e6b999 100644
--- a/tools/find_build_apps/cmake.py
+++ b/tools/find_build_apps/cmake.py
@@ -53,7 +53,7 @@ class CMakeBuildSystem(BuildSystem):
         # Note: the build system supports taking multiple sdkconfig.defaults files via SDKCONFIG_DEFAULTS
         # CMake variable. However here we do this manually to perform environment variable expansion in the
         # sdkconfig files.
-        sdkconfig_defaults_list = ["sdkconfig.defaults"]
+        sdkconfig_defaults_list = ["sdkconfig.defaults", "sdkconfig.defaults." + build_item.target]
         if build_item.sdkconfig_path:
             sdkconfig_defaults_list.append(build_item.sdkconfig_path)