diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b49ee1c6..b67db862e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: normal
 
   UNIT_TEST_BUILD_SYSTEM: cmake
+  EXAMPLE_TEST_BUILD_SYSTEM: cmake
 # IDF environment
 
   IDF_PATH: "$CI_PROJECT_DIR"
diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index 50cf87e5d..afeba1692 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -132,6 +132,7 @@ build_examples_make:
       - build_examples/*/*/*/build/*.map
       - build_examples/*/*/*/build/download.config
       - build_examples/*/*/*/build/bootloader/*.bin
+      - build_examples/*/*/*/*/build/partition_table/*.bin
       - $LOG_PATH
     expire_in: 3 days
   variables:
@@ -161,6 +162,10 @@ build_examples_make:
     # build some of examples
     - mkdir -p ${LOG_PATH}
     - ${IDF_PATH}/tools/ci/build_examples.sh
+    # Check if the tests demand Make built binaries. If not, delete them
+    - if [ "$EXAMPLE_TEST_BUILD_SYSTEM" == "make" ]; then exit 0; fi
+    - cd ..
+    - rm -rf build_examples
 
 # same as above, but for CMake
 .build_examples_cmake: &build_examples_cmake
@@ -169,12 +174,13 @@ build_examples_make:
   artifacts:
     when: always
     paths:
-      - build_examples_cmake/*/*/*/*/build/*.bin
-      - build_examples_cmake/*/*/*/*/sdkconfig
-      - build_examples_cmake/*/*/*/*/build/*.elf
-      - build_examples_cmake/*/*/*/*/build/*.map
-      - build_examples_cmake/*/*/*/*/build/flasher_args.json
-      - build_examples_cmake/*/*/*/*/build/bootloader/*.bin
+      - build_examples/*/*/*/*/build/*.bin
+      - build_examples/*/*/*/*/sdkconfig
+      - build_examples/*/*/*/*/build/*.elf
+      - build_examples/*/*/*/*/build/*.map
+      - build_examples/*/*/*/*/build/flasher_args.json
+      - build_examples/*/*/*/*/build/bootloader/*.bin
+      - build_examples/*/*/*/*/build/partition_table/*.bin
       - $LOG_PATH
     expire_in: 3 days
   variables:
@@ -189,12 +195,16 @@ build_examples_make:
   script:
     # it's not possible to build 100% out-of-tree and have the "artifacts"
     # mechanism work, but this is the next best thing
-    - rm -rf build_examples_cmake
-    - mkdir build_examples_cmake
-    - cd build_examples_cmake
+    - rm -rf build_examples
+    - mkdir build_examples
+    - cd build_examples
     # build some of examples
     - mkdir -p ${LOG_PATH}
     - ${IDF_PATH}/tools/ci/build_examples_cmake.sh
+    # Check if the tests demand CMake built binaries. If not, delete them
+    - if [ "$EXAMPLE_TEST_BUILD_SYSTEM" == "cmake" ]; then exit 0; fi
+    - cd ..
+    - rm -rf build_examples
 
 build_examples_cmake_esp32:
   extends: .build_examples_cmake
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 45a04bd4e..cafed02ac 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -23,6 +23,7 @@
     - assign_test
     - build_examples_make
     - build_examples_cmake_esp32
+    - build_examples_cmake_esp32s2
   artifacts:
     when: always
     paths: