diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml
index 881cc2c2e..6f4baca8f 100644
--- a/tools/ci/config/pre_check.yml
+++ b/tools/ci/config/pre_check.yml
@@ -123,18 +123,22 @@ build_template_app:
 
     # CONFIG_COMPILER_OPTIMIZATION_DEFAULT with flag -Og
     - echo "CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # CONFIG_COMPILER_OPTIMIZATION_NONE with flag -O0
     - echo "CONFIG_COMPILER_OPTIMIZATION_NONE=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # CONFIG_COMPILER_OPTIMIZATION_SIZE with flag -Os
     - echo "CONFIG_COMPILER_OPTIMIZATION_SIZE=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # CONFIG_COMPILER_OPTIMIZATION_PERF with flag -O2
     - echo "CONFIG_COMPILER_OPTIMIZATION_PERF=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # Same as above, but also disable assertions.
diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release
index 75da1aa80..a7f1c0c7f 100644
--- a/tools/unit-test-app/configs/release
+++ b/tools/unit-test-app/configs/release
@@ -1,3 +1,4 @@
 TEST_COMPONENTS=freertos esp32 driver heap pthread soc spi_flash vfs
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/tools/unit-test-app/configs/release_2 b/tools/unit-test-app/configs/release_2
index d683fe7b3..aaa826080 100644
--- a/tools/unit-test-app/configs/release_2
+++ b/tools/unit-test-app/configs/release_2
@@ -1,3 +1,4 @@
 TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 driver heap pthread soc spi_flash vfs test_utils
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/tools/unit-test-app/configs/release_2_s2 b/tools/unit-test-app/configs/release_2_s2
index d6e2bbfca..e385a715f 100644
--- a/tools/unit-test-app/configs/release_2_s2
+++ b/tools/unit-test-app/configs/release_2_s2
@@ -1,4 +1,5 @@
 TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta driver heap pthread soc spi_flash vfs test_utils
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 CONFIG_IDF_TARGET="esp32s2beta"
diff --git a/tools/unit-test-app/configs/release_s2 b/tools/unit-test-app/configs/release_s2
index aaa50b0ce..f9268fe93 100644
--- a/tools/unit-test-app/configs/release_s2
+++ b/tools/unit-test-app/configs/release_s2
@@ -1,4 +1,5 @@
 TEST_COMPONENTS=freertos esp32s2beta driver heap pthread soc spi_flash vfs
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 CONFIG_IDF_TARGET="esp32s2beta"