diff --git a/tools/build_apps.py b/tools/build_apps.py
index 5b0688540..be83347f9 100755
--- a/tools/build_apps.py
+++ b/tools/build_apps.py
@@ -125,8 +125,8 @@ def main():
         else:
             if not build_info.preserve:
                 logging.info('NOT preserve artifacts detected. Deleting...')
+                # we only remove binaries here, log files are still needed by check_build_warnings.py
                 shutil.rmtree(build_info.work_dir, ignore_errors=True)
-                shutil.rmtree(build_info.build_log_path, ignore_errors=True)
 
     if failed_builds:
         logging.error("The following build have failed:")
diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh
index bf483d1eb..4a5915d10 100755
--- a/tools/ci/build_examples.sh
+++ b/tools/ci/build_examples.sh
@@ -106,4 +106,4 @@ ${IDF_PATH}/tools/build_apps.py \
 
 
 # Check for build warnings
-#${IDF_PATH}/tools/ci/check_build_warnings.py -vv ${JOB_BUILD_LIST_JSON}
+${IDF_PATH}/tools/ci/check_build_warnings.py -vv ${JOB_BUILD_LIST_JSON}
diff --git a/tools/ci/build_test_apps.sh b/tools/ci/build_test_apps.sh
index 87757bc2f..627d1bb78 100755
--- a/tools/ci/build_test_apps.sh
+++ b/tools/ci/build_test_apps.sh
@@ -100,4 +100,4 @@ ${IDF_PATH}/tools/build_apps.py \
 
 
 # Check for build warnings
-#${IDF_PATH}/tools/ci/check_build_warnings.py -vv ${JOB_BUILD_LIST_JSON}
+${IDF_PATH}/tools/ci/check_build_warnings.py -vv ${JOB_BUILD_LIST_JSON}
diff --git a/tools/ci/check_build_warnings.py b/tools/ci/check_build_warnings.py
index e64cc4066..bb01035ac 100755
--- a/tools/ci/check_build_warnings.py
+++ b/tools/ci/check_build_warnings.py
@@ -77,6 +77,9 @@ def main():
 
     found_warnings = 0
     for build_item in build_items:
+        if not build_item.build:
+            logging.debug('Skipping build detected. Skipping checking...')
+            continue
         if not build_item.build_log_path:
             logging.debug("No log file for {}".format(build_item.work_dir))
             continue
diff --git a/tools/find_apps.py b/tools/find_apps.py
index 0d8030e66..a7cfe0872 100755
--- a/tools/find_apps.py
+++ b/tools/find_apps.py
@@ -142,8 +142,6 @@ def find_apps(build_system_class, path, recursive, exclude_list, target):
     :param recursive: whether to recursively descend into nested directories if no app is found
     :param exclude_list: list of paths to be excluded from the recursive search
     :param target: desired value of IDF_TARGET; apps incompatible with the given target are skipped.
-    :param build_apps_list_file: List of apps need to be built, apps not on this list will be skipped.
-                                 None or empty file to build all apps.
     :return: list of paths of the apps found
     """
     build_system_name = build_system_class.NAME