diff --git a/tools/test_apps/security/secure_boot/README.md b/tools/test_apps/security/secure_boot/README.md
index 44f9534b16..fede569c6f 100644
--- a/tools/test_apps/security/secure_boot/README.md
+++ b/tools/test_apps/security/secure_boot/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 |
-| ----------------- | ----- |
+| Supported Targets | ESP32 | ESP32-S2 |
+| ----------------- | ----- | -------- |
 
 # Secure Boot
 
diff --git a/tools/test_apps/security/secure_boot/main/CMakeLists.txt b/tools/test_apps/security/secure_boot/main/CMakeLists.txt
index 9cdeffe28a..39ee3d3c6f 100644
--- a/tools/test_apps/security/secure_boot/main/CMakeLists.txt
+++ b/tools/test_apps/security/secure_boot/main/CMakeLists.txt
@@ -1,2 +1,8 @@
-idf_component_register(SRCS "secure_boot_main.c"
-                    INCLUDE_DIRS ".")
+
+if(CONFIG_IDF_TARGET_ESP32)
+    set(main_src "secure_boot_main_esp32.c")
+else()
+    set(main_src "secure_boot_main.c")
+endif()
+
+idf_component_register(SRCS "${main_src}" INCLUDE_DIRS ".")
diff --git a/tools/test_apps/security/secure_boot/main/secure_boot_main.c b/tools/test_apps/security/secure_boot/main/secure_boot_main.c
index 75328d9717..0ca31e3bfa 100644
--- a/tools/test_apps/security/secure_boot/main/secure_boot_main.c
+++ b/tools/test_apps/security/secure_boot/main/secure_boot_main.c
@@ -11,6 +11,7 @@
 #include "freertos/task.h"
 #include "soc/efuse_reg.h"
 #include "esp_efuse.h"
+#include "esp_secure_boot.h"
 #include "esp_system.h"
 #include "esp_spi_flash.h"
 #include "esp_log.h"
@@ -36,10 +37,7 @@ static void example_print_chip_info(void)
     /* Print chip information */
     esp_chip_info_t chip_info;
     esp_chip_info(&chip_info);
-    printf("This is ESP32 chip with %d CPU cores, WiFi%s%s, ",
-            chip_info.cores,
-            (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
-            (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
+    printf("This is %s chip with %d CPU cores\n", CONFIG_IDF_TARGET, chip_info.cores);
 
     printf("silicon revision %d, ", chip_info.revision);
 
@@ -51,46 +49,23 @@ static void example_print_chip_info(void)
 
 static void example_secure_boot_status(void)
 {
-    uint32_t efuse_block0 = REG_READ(EFUSE_BLK0_RDATA6_REG);
+    ets_secure_boot_key_digests_t trusted_keys = { 0};
 
-#ifdef CONFIG_ESP32_REV_MIN_3
-    uint8_t efuse_trusted_digest[DIGEST_LEN] = {0}, i;
-    ESP_LOGI(TAG, "Checking for secure boot v2..");
-    if(efuse_block0 & EFUSE_RD_ABS_DONE_1) {
-        ESP_LOGI(TAG, "ABS_DONE_1 is set. Secure Boot V2 enabled");
-        memcpy(efuse_trusted_digest, (uint8_t *)EFUSE_BLK2_RDATA0_REG, DIGEST_LEN);
-        ESP_LOGI(TAG,  "Reading the public key digest from BLK2.");
-        for (i = 0; i < DIGEST_LEN; i++) {
-            ESP_LOGI(TAG, "%02x \t", efuse_trusted_digest[i]);
+    ESP_LOGI(TAG, "Checking for Secure Boot..");
+    if(esp_secure_boot_enabled()) {
+        ESP_LOGI(TAG, "Secure Boot is enabled");
+        ESP_ERROR_CHECK( esp_secure_boot_read_key_digests(&trusted_keys) );
+
+        unsigned total = 0;
+        for (int i = 0; i < MAX_KEY_DIGESTS; i++) {
+            ESP_LOGI(TAG, "Key slot %d:", i);
+            if (trusted_keys.key_digests[i]) {
+                ESP_LOG_BUFFER_HEXDUMP("trusted key", trusted_keys.key_digests[i], DIGEST_LEN, ESP_LOG_INFO);
+                total++;
+            }
         }
-        return;
+        ESP_LOGI(TAG, "Total %d trusted public keys", total);
     } else {
-        ESP_LOGI(TAG, "Secure boot v2 not enabled. Enable Secure Boot V2 in menuconfig, build & flash again.");
-    }
-#endif
-
-    ESP_LOGI(TAG, "Checking for secure boot v1..");
-    uint32_t dis_reg = REG_READ(EFUSE_BLK0_RDATA0_REG);
-    if (efuse_block0 & EFUSE_RD_ABS_DONE_0) {
-    ESP_LOGI(TAG, "ABS_DONE_0 is set. Secure Boot V1 enabled");
-#ifdef CONFIG_ESP32_REV_MIN_3
-    ESP_LOGW(TAG, "This chip version supports Secure Boot V2. It is recommended to use Secure Boot V2.");
-#endif
-        bool efuse_key_read_protected = dis_reg & EFUSE_RD_DIS_BLK2;
-        bool efuse_key_write_protected = dis_reg & EFUSE_WR_DIS_BLK2;
-
-        ESP_LOGI(TAG, "Checking the integrityof the key in BLK2..");
-        if (!efuse_key_read_protected) {
-            ESP_LOGE(TAG, "Key is not read protected. Refusing to blow secure boot efuse.");
-            return;
-        }
-        if (!efuse_key_write_protected) {
-            ESP_LOGE(TAG, "Key is not write protected. Refusing to blow secure boot efuse.");
-            return;
-        }
-        ESP_LOGI(TAG, "Key is read/write protected in eFuse.");
-        return;
-    } else {
-        ESP_LOGI(TAG, "Secure Boot V1 not enabled. Enable Secure Boot in menuconfig, build & flash again.");
+        ESP_LOGI(TAG, "Secure Boot not enabled. Enable Secure Boot in menuconfig, build & flash again.");
     }
 }
diff --git a/tools/test_apps/security/secure_boot/main/secure_boot_main_esp32.c b/tools/test_apps/security/secure_boot/main/secure_boot_main_esp32.c
new file mode 100644
index 0000000000..75328d9717
--- /dev/null
+++ b/tools/test_apps/security/secure_boot/main/secure_boot_main_esp32.c
@@ -0,0 +1,96 @@
+/* Flash encryption Example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#include <stdio.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "soc/efuse_reg.h"
+#include "esp_efuse.h"
+#include "esp_system.h"
+#include "esp_spi_flash.h"
+#include "esp_log.h"
+#include "esp_efuse_table.h"
+#include <string.h>
+
+static void example_print_chip_info(void);
+static void example_secure_boot_status(void);
+
+#define TAG "example_secure_boot"
+
+void app_main(void)
+{
+    printf("\nExample to check Secure Boot status\n");
+
+    example_print_chip_info();
+    example_secure_boot_status();
+}
+
+
+static void example_print_chip_info(void)
+{
+    /* Print chip information */
+    esp_chip_info_t chip_info;
+    esp_chip_info(&chip_info);
+    printf("This is ESP32 chip with %d CPU cores, WiFi%s%s, ",
+            chip_info.cores,
+            (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
+            (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
+
+    printf("silicon revision %d, ", chip_info.revision);
+
+    printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024),
+            (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
+}
+
+#define DIGEST_LEN 32
+
+static void example_secure_boot_status(void)
+{
+    uint32_t efuse_block0 = REG_READ(EFUSE_BLK0_RDATA6_REG);
+
+#ifdef CONFIG_ESP32_REV_MIN_3
+    uint8_t efuse_trusted_digest[DIGEST_LEN] = {0}, i;
+    ESP_LOGI(TAG, "Checking for secure boot v2..");
+    if(efuse_block0 & EFUSE_RD_ABS_DONE_1) {
+        ESP_LOGI(TAG, "ABS_DONE_1 is set. Secure Boot V2 enabled");
+        memcpy(efuse_trusted_digest, (uint8_t *)EFUSE_BLK2_RDATA0_REG, DIGEST_LEN);
+        ESP_LOGI(TAG,  "Reading the public key digest from BLK2.");
+        for (i = 0; i < DIGEST_LEN; i++) {
+            ESP_LOGI(TAG, "%02x \t", efuse_trusted_digest[i]);
+        }
+        return;
+    } else {
+        ESP_LOGI(TAG, "Secure boot v2 not enabled. Enable Secure Boot V2 in menuconfig, build & flash again.");
+    }
+#endif
+
+    ESP_LOGI(TAG, "Checking for secure boot v1..");
+    uint32_t dis_reg = REG_READ(EFUSE_BLK0_RDATA0_REG);
+    if (efuse_block0 & EFUSE_RD_ABS_DONE_0) {
+    ESP_LOGI(TAG, "ABS_DONE_0 is set. Secure Boot V1 enabled");
+#ifdef CONFIG_ESP32_REV_MIN_3
+    ESP_LOGW(TAG, "This chip version supports Secure Boot V2. It is recommended to use Secure Boot V2.");
+#endif
+        bool efuse_key_read_protected = dis_reg & EFUSE_RD_DIS_BLK2;
+        bool efuse_key_write_protected = dis_reg & EFUSE_WR_DIS_BLK2;
+
+        ESP_LOGI(TAG, "Checking the integrityof the key in BLK2..");
+        if (!efuse_key_read_protected) {
+            ESP_LOGE(TAG, "Key is not read protected. Refusing to blow secure boot efuse.");
+            return;
+        }
+        if (!efuse_key_write_protected) {
+            ESP_LOGE(TAG, "Key is not write protected. Refusing to blow secure boot efuse.");
+            return;
+        }
+        ESP_LOGI(TAG, "Key is read/write protected in eFuse.");
+        return;
+    } else {
+        ESP_LOGI(TAG, "Secure Boot V1 not enabled. Enable Secure Boot in menuconfig, build & flash again.");
+    }
+}
diff --git a/tools/test_apps/security/secure_boot/sdkconfig.ci.04 b/tools/test_apps/security/secure_boot/sdkconfig.ci.04
index d2a5162afd..92ee68c11e 100644
--- a/tools/test_apps/security/secure_boot/sdkconfig.ci.04
+++ b/tools/test_apps/security/secure_boot/sdkconfig.ci.04
@@ -3,4 +3,4 @@ CONFIG_IDF_TARGET="esp32s2"
 CONFIG_SECURE_BOOT=y
 CONFIG_SECURE_BOOT_SIGNING_KEY="test_rsa_3072_key.pem"
 CONFIG_SECURE_FLASH_ENC_ENABLED=y
-SECURE_FLASH_ENCRYPTION_MODE_RELEASE=y
+CONFIG_SECURE_FLASH_ENCRYPTION_MODE_RELEASE=y