diff --git a/tools/ci/build_examples_cmake.sh b/tools/ci/build_examples_cmake.sh
index fc8089b65e..8205aa17f8 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/ci/build_test_apps.sh b/tools/ci/build_test_apps.sh
index d8498fe638..171935be2f 100755
--- a/tools/ci/build_test_apps.sh
+++ b/tools/ci/build_test_apps.sh
@@ -51,9 +51,8 @@ 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"
+echo "build_test_apps running for target $IDF_TARGET"
 
 cd ${IDF_PATH}
 
@@ -70,7 +69,7 @@ ${IDF_PATH}/tools/find_apps.py tools/test_apps \
     --recursive \
     --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.*=' \