diff --git a/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
index 65605c1d3b9..8ab4fbcb890 100644
--- a/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
@@ -119,6 +119,10 @@ config SOC_USB_SERIAL_JTAG_SUPPORTED
     bool
     default y
 
+config SOC_SUPPORTS_SECURE_DL_MODE
+    bool
+    default y
+
 config SOC_ULP_SUPPORTED
     bool
     default y
diff --git a/components/soc/esp32s31/include/soc/soc_caps.h b/components/soc/esp32s31/include/soc/soc_caps.h
index 53e2aec61a3..95b629556b8 100644
--- a/components/soc/esp32s31/include/soc/soc_caps.h
+++ b/components/soc/esp32s31/include/soc/soc_caps.h
@@ -52,7 +52,7 @@
 #define SOC_USB_DFU_SUPPORTED           1
 #define SOC_TEMP_SENSOR_SUPPORTED       1
 #define SOC_USB_SERIAL_JTAG_SUPPORTED   1
-// #define SOC_SUPPORTS_SECURE_DL_MODE     1      // TODO: [ESP32S31] IDF-14629
+#define SOC_SUPPORTS_SECURE_DL_MODE     1
 #define SOC_ULP_SUPPORTED               1
 #define SOC_LP_CORE_SUPPORTED           1
 #define SOC_EFUSE_KEY_PURPOSE_FIELD     1
diff --git a/components/spi_flash/test_apps/.build-test-rules.yml b/components/spi_flash/test_apps/.build-test-rules.yml
index 918aee4470c..359c5225e43 100644
--- a/components/spi_flash/test_apps/.build-test-rules.yml
+++ b/components/spi_flash/test_apps/.build-test-rules.yml
@@ -40,12 +40,8 @@ components/spi_flash/test_apps/esp_flash_stress:
     - esp_hal_mspi
 
 components/spi_flash/test_apps/flash_encryption:
-  disable:
-    - if: IDF_TARGET in ["esp32s31"]
-      temporary: true
-      reason: not support yet # TODO: [ESP32S31] IDF-14628
   disable_test:
-    - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6", "esp32h2", "esp32p4", "esp32c5", "esp32c61", "esp32h21", "esp32h4"]
+    - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6", "esp32h2", "esp32p4", "esp32c5", "esp32c61", "esp32h21", "esp32h4", "esp32s31"]
       temporary: true
       reason: No runners # IDF-5634
 
diff --git a/components/spi_flash/test_apps/flash_encryption/README.md b/components/spi_flash/test_apps/flash_encryption/README.md
index 1360df1b6b4..b466bcad976 100644
--- a/components/spi_flash/test_apps/flash_encryption/README.md
+++ b/components/spi_flash/test_apps/flash_encryption/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- |
 
 ## Prepare runner
 
diff --git a/examples/security/.build-test-rules.yml b/examples/security/.build-test-rules.yml
index aa9ed4bde34..29ec9f467be 100644
--- a/examples/security/.build-test-rules.yml
+++ b/examples/security/.build-test-rules.yml
@@ -4,14 +4,14 @@ examples/security/flash_encryption:
   disable:
     - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1
     - if: CONFIG_NAME == "key_mgr" and SOC_KEY_MANAGER_SUPPORTED != 1
-    - if: IDF_TARGET in ["esp32s31", "esp32h4"]
+    - if: IDF_TARGET in ["esp32h4"]
       temporary: true
-      reason: not support yet # TODO: [ESP32S31] IDF-14628 [ESP32H4] IDF-12261
+      reason: not support yet # TODO: [ESP32H4] IDF-12261
   disable_test:
     - if: CONFIG_NAME == "key_mgr"
       temporary: true
       reason: lack of runners
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2", "esp32c2", "esp32c5", "esp32c61"]
+    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2", "esp32c2", "esp32c5", "esp32c61", "esp32s31"]
       temporary: true
       reason: lack of runners
   depends_components:
diff --git a/examples/security/flash_encryption/README.md b/examples/security/flash_encryption/README.md
index 89e1debeadb..fc0faf2a587 100644
--- a/examples/security/flash_encryption/README.md
+++ b/examples/security/flash_encryption/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | --------- |
 
 # Flash Encryption
 
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32s31 b/examples/wifi/iperf/sdkconfig.defaults.esp32s31
index 0714d07186e..def485ba9dd 100644
--- a/examples/wifi/iperf/sdkconfig.defaults.esp32s31
+++ b/examples/wifi/iperf/sdkconfig.defaults.esp32s31
@@ -48,9 +48,4 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x1
 CONFIG_IPERF_DEF_TCP_TX_BUFFER_LEN=2880
 CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=12
 
-#TODO IDF-14625 IDF-14630 IDF-14631 IDF-14633
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_HARDWARE_SHA=n
-CONFIG_MBEDTLS_HARDWARE_ECC=n
 #CONFIG_FREERTOS_UNICORE=y
diff --git a/tools/test_apps/build_system/.build-test-rules.yml b/tools/test_apps/build_system/.build-test-rules.yml
index c02632e34af..d3c9077e00e 100644
--- a/tools/test_apps/build_system/.build-test-rules.yml
+++ b/tools/test_apps/build_system/.build-test-rules.yml
@@ -2,8 +2,8 @@
 
 tools/test_apps/build_system/bootloader:
   disable:
-    - if: IDF_TARGET == "linux" or IDF_TARGET in ["esp32s31"]
-      reason: the test should run on all targets except linux and esp32s31 encryption build cannot pass IDF-14629
+    - if: IDF_TARGET == "linux"
+      reason: the test should run on all targets except linux
 
 tools/test_apps/build_system/custom_partition_subtypes:
   enable:
diff --git a/tools/test_apps/build_system/bootloader/README.md b/tools/test_apps/build_system/bootloader/README.md
index 44f3780f1d6..d76348d52c2 100644
--- a/tools/test_apps/build_system/bootloader/README.md
+++ b/tools/test_apps/build_system/bootloader/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- |
diff --git a/tools/test_apps/system/.build-test-rules.yml b/tools/test_apps/system/.build-test-rules.yml
index afbb008a186..610cbccafaf 100644
--- a/tools/test_apps/system/.build-test-rules.yml
+++ b/tools/test_apps/system/.build-test-rules.yml
@@ -5,9 +5,6 @@ tools/test_apps/system/bootloader_sections:
     - if: CONFIG_NAME == "rtc_retain" and SOC_RTC_FAST_MEM_SUPPORTED != 1
     - if: CONFIG_NAME == "flash_encryption_key_mgr" and (SOC_KEY_MANAGER_FE_KEY_DEPLOY != 1 or IDF_TARGET == "esp32p4")
     - if: CONFIG_NAME == "flash_encryption_key_mgr_esp32p4" and IDF_TARGET != "esp32p4"
-    - if: IDF_TARGET == "esp32s31"
-      temporary: true
-      reason: cannot pass build because flash encryption is not supported yet # TODO: [ESP32S31] IDF-14628
 
 tools/test_apps/system/build_tests/client_only_mbedtls:
   disable:
diff --git a/tools/test_apps/system/bootloader_sections/README.md b/tools/test_apps/system/bootloader_sections/README.md
index 44f3780f1d6..d76348d52c2 100644
--- a/tools/test_apps/system/bootloader_sections/README.md
+++ b/tools/test_apps/system/bootloader_sections/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- |