diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
index 305f74d508..31d3e75594 100644
--- a/components/esp_rom/CMakeLists.txt
+++ b/components/esp_rom/CMakeLists.txt
@@ -182,7 +182,6 @@ else() # Regular app build
         rom_linker_script("coexist")
         rom_linker_script("net80211")
         rom_linker_script("pp")
-
     elseif(target STREQUAL "esp32c5")
         # esp32c5.rom.api.ld has been split to several lds by components.
         # esp32c5.rom.api.ld is still reserved to map the APIs
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld
index d3dd938ddf..03992297de 100644
--- a/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld
+++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld
@@ -65,7 +65,7 @@ wifi_get_macaddr = 0x40000bc4;
 wifi_rf_phy_disable = 0x40000bc8;
 wifi_rf_phy_enable = 0x40000bcc;
 wifi_is_started = 0x40000bd0;
-sta_input = 0x40000bd4;
+/*sta_input = 0x40000bd4;*/
 sta_rx_eapol = 0x40000bd8;
 sta_reset_beacon_timeout = 0x40000bdc;
 sta_get_beacon_timeout = 0x40000be0;
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
index 16afe5998b..2090d1edc3 100644
--- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
+++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
@@ -236,10 +236,10 @@ rcGetSched = 0x40000f40;
 rcLowerSched = 0x40000f44;
 rcSetTxAmpduLimit = 0x40000f48;
 rcTxUpdatePer = 0x40000f4c;
-rcUpdateAckSnr = 0x40000f50;
+/*rcUpdateAckSnr = 0x40000f50;*/
 rcUpdateRate = 0x40000f54;
-rcUpdateTxDone = 0x40000f58;
-rcUpdateTxDoneAmpdu2 = 0x40000f5c;
+/*rcUpdateTxDone = 0x40000f58;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40000f5c;*/
 rcUpSched = 0x40000f60;
 rcReachRetryLimit = 0x40000f64;
 rcGetDCMMaxRate = 0x40000f68;
@@ -264,7 +264,7 @@ wDevCheckBlockError = 0x40000fac;
 wDev_DiscardFrame = 0x40000fb4;
 wDev_GetNoiseFloor = 0x40000fb8;
 wDev_IndicateAmpdu = 0x40000fbc;
-wDev_IndicateFrame = 0x40000fc0;
+/*wDev_IndicateFrame = 0x40000fc0;*/
 wdev_mac_reg_load = 0x40000fc4;
 wdev_mac_reg_store = 0x40000fc8;
 wdev_mac_special_reg_load = 0x40000fcc;
diff --git a/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h b/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h
index 0907c290a5..4a0197aa4d 100644
--- a/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h
+++ b/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h
@@ -430,6 +430,7 @@ typedef struct {
     int mubar;
     int bfrp;
     int nfrp;
+    int bar;
 } esp_test_rx_ctrl_t;
 
 typedef enum {
diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c
index 29543b5036..17b670b146 100644
--- a/components/esp_wifi/src/wifi_init.c
+++ b/components/esp_wifi/src/wifi_init.c
@@ -196,7 +196,7 @@ static esp_err_t wifi_deinit_internal(void)
     esp_wifi_beacon_monitor_configure(&monitor_config);
 #endif
 
-#if CONFIG_ESP_WIFI_SLP_IRAM_OPT
+#if CONFIG_PM_ENABLE && CONFIG_ESP_WIFI_SLP_IRAM_OPT
     esp_pm_unregister_light_sleep_default_params_config_callback();
 #endif
 #if CONFIG_FREERTOS_USE_TICKLESS_IDLE
@@ -321,7 +321,7 @@ esp_err_t esp_wifi_init(const wifi_init_config_t *config)
     }
 #endif
 
-#if CONFIG_ESP_WIFI_SLP_IRAM_OPT
+#if CONFIG_PM_ENABLE && CONFIG_ESP_WIFI_SLP_IRAM_OPT
     int min_freq_mhz = esp_pm_impl_get_cpu_freq(PM_MODE_LIGHT_SLEEP);
     int max_freq_mhz = esp_pm_impl_get_cpu_freq(PM_MODE_CPU_MAX);
     esp_wifi_internal_update_light_sleep_default_params(min_freq_mhz, max_freq_mhz);
diff --git a/components/esp_wifi/test_apps/.build-test-rules.yml b/components/esp_wifi/test_apps/.build-test-rules.yml
index bf19dc53b2..ff8f5aa253 100644
--- a/components/esp_wifi/test_apps/.build-test-rules.yml
+++ b/components/esp_wifi/test_apps/.build-test-rules.yml
@@ -10,3 +10,6 @@ components/esp_wifi/test_apps/wifi_connect:
 components/esp_wifi/test_apps/wifi_function:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
+  disable_test:
+    - if: IDF_TARGET in ["esp32c5"]
+      reason: leak of runner
diff --git a/components/esp_wifi/test_apps/wifi_connect/README.md b/components/esp_wifi/test_apps/wifi_connect/README.md
index 7e7523ec85..0c839f750c 100644
--- a/components/esp_wifi/test_apps/wifi_connect/README.md
+++ b/components/esp_wifi/test_apps/wifi_connect/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
diff --git a/components/esp_wifi/test_apps/wifi_function/README.md b/components/esp_wifi/test_apps/wifi_function/README.md
index cd9be654c0..097edbf0c4 100644
--- a/components/esp_wifi/test_apps/wifi_function/README.md
+++ b/components/esp_wifi/test_apps/wifi_function/README.md
@@ -1,3 +1,3 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
diff --git a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
index fa20d497f7..050d947a8d 100644
--- a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
@@ -51,6 +51,14 @@ config SOC_USB_SERIAL_JTAG_SUPPORTED
     bool
     default y
 
+config SOC_PHY_SUPPORTED
+    bool
+    default y
+
+config SOC_WIFI_SUPPORTED
+    bool
+    default y
+
 config SOC_SUPPORTS_SECURE_DL_MODE
     bool
     default y
@@ -1099,6 +1107,10 @@ config SOC_UART_SUPPORT_FSM_TX_WAIT_SEND
     bool
     default y
 
+config SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH
+    int
+    default 12
+
 config SOC_PM_SUPPORT_MODEM_PD
     bool
     default y
@@ -1159,6 +1171,38 @@ config SOC_RCC_IS_INDEPENDENT
     bool
     default y
 
+config SOC_WIFI_HW_TSF
+    bool
+    default y
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default n
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_WAPI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_HE_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_HE_SUPPORT_5G
+    bool
+    default y
+
 config SOC_BLE_SUPPORTED
     bool
     default y
diff --git a/components/soc/esp32c5/include/soc/soc_caps.h b/components/soc/esp32c5/include/soc/soc_caps.h
index 07ae6dd52d..8c2d5b77f5 100644
--- a/components/soc/esp32c5/include/soc/soc_caps.h
+++ b/components/soc/esp32c5/include/soc/soc_caps.h
@@ -31,7 +31,8 @@
 #define SOC_ASYNC_MEMCPY_SUPPORTED      1
 #define SOC_USB_SERIAL_JTAG_SUPPORTED   1
 // #define SOC_TEMP_SENSOR_SUPPORTED       1  // TODO: [ESP32C5] IDF-8727
-// #define SOC_WIFI_SUPPORTED              1  // TODO: [ESP32C5] IDF-8851
+#define SOC_PHY_SUPPORTED               1
+#define SOC_WIFI_SUPPORTED              1
 #define SOC_SUPPORTS_SECURE_DL_MODE     1
 #define SOC_LP_CORE_SUPPORTED           1
 #define SOC_ULP_SUPPORTED               1
@@ -522,7 +523,7 @@
 // #define SOC_PHY_DIG_REGS_MEM_SIZE       (21*4)
 
 /*--------------- WIFI LIGHT SLEEP CLOCK WIDTH CAPS --------------------------*/
-// #define SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH  (12)
+#define SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH  (12)
 
 /*-------------------------- Power Management CAPS ----------------------------*/
 // #define SOC_PM_SUPPORT_WIFI_WAKEUP      (1)
@@ -570,13 +571,14 @@
 // #define SOC_TEMPERATURE_SENSOR_INTR_SUPPORT                   (1)
 
 /*------------------------------------ WI-FI CAPS ------------------------------------*/
-// #define SOC_WIFI_HW_TSF                     (1)    /*!< Support hardware TSF */
-// #define SOC_WIFI_FTM_SUPPORT                (0)    /*!< Support FTM */
-// #define SOC_WIFI_GCMP_SUPPORT               (1)    /*!< Support GCMP(GCMP128 and GCMP256) */
-// #define SOC_WIFI_WAPI_SUPPORT               (1)    /*!< Support WAPI */
-// #define SOC_WIFI_CSI_SUPPORT                (1)    /*!< Support CSI */
-// #define SOC_WIFI_MESH_SUPPORT               (1)    /*!< Support WIFI MESH */
-// #define SOC_WIFI_HE_SUPPORT                 (1)    /*!< Support Wi-Fi 6 */
+#define SOC_WIFI_HW_TSF                     (1)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT                (0)    /*!< Support FTM */
+#define SOC_WIFI_GCMP_SUPPORT               (1)    /*!< Support GCMP(GCMP128 and GCMP256) */
+#define SOC_WIFI_WAPI_SUPPORT               (1)    /*!< Support WAPI */
+#define SOC_WIFI_CSI_SUPPORT                (1)    /*!< Support CSI */
+#define SOC_WIFI_MESH_SUPPORT               (1)    /*!< Support WIFI MESH */
+#define SOC_WIFI_HE_SUPPORT                 (1)    /*!< Support Wi-Fi 6 */
+#define SOC_WIFI_HE_SUPPORT_5G              (1)    /*!< Support Wi-Fi 6 in 5G */
 
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED                   (1)    /*!< Support Bluetooth Low Energy hardware */
diff --git a/components/wpa_supplicant/test_apps/.build-test-rules.yml b/components/wpa_supplicant/test_apps/.build-test-rules.yml
index 6013a2343c..0a315ea208 100644
--- a/components/wpa_supplicant/test_apps/.build-test-rules.yml
+++ b/components/wpa_supplicant/test_apps/.build-test-rules.yml
@@ -3,6 +3,9 @@
 components/wpa_supplicant/test_apps:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
+  disable_test:
+    - if: IDF_TARGET in ["esp32c5"]
+      reason: leak of runner
   depends_components:
     - esp_wifi
     - wpa_supplicant
diff --git a/components/wpa_supplicant/test_apps/README.md b/components/wpa_supplicant/test_apps/README.md
index 3fa2378f00..57661ca258 100644
--- a/components/wpa_supplicant/test_apps/README.md
+++ b/components/wpa_supplicant/test_apps/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # wpa_supplicant unit test
 
diff --git a/examples/mesh/internal_communication/README.md b/examples/mesh/internal_communication/README.md
index a7179b9b98..a86b04351c 100644
--- a/examples/mesh/internal_communication/README.md
+++ b/examples/mesh/internal_communication/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Mesh Internal Communication Example
 
@@ -22,5 +22,5 @@ Features Demonstrated
 Open project configuration menu (`idf.py menuconfig`) to configure the mesh network channel, router SSID, router password and mesh softAP settings.
 
 When the mesh network is established and if you happen to run this example on ESP-WROVER-KIT boards, the RGB light indicator will show you on which layer devices are.
-The pink reprents root; the yellow reprents layer 2; the red reprents layer 3; the blue reprents layer 4; the green reprents layer 5; the white reprents layer greater than 5.
+The pink represents root; the yellow represents layer 2; the red represents layer 3; the blue represents layer 4; the green represents layer 5; the white represents layer greater than 5.
 Root continuously sends an On / Off control message to all devices in its routing table. Devices including root itself receive this message and do the On / Off.
diff --git a/examples/mesh/ip_internal_network/README.md b/examples/mesh/ip_internal_network/README.md
index 08234b65f6..2cbf75ed58 100644
--- a/examples/mesh/ip_internal_network/README.md
+++ b/examples/mesh/ip_internal_network/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Mesh IP Internal Networking example
 
diff --git a/examples/mesh/manual_networking/README.md b/examples/mesh/manual_networking/README.md
index c3dba9ee1e..276ea16130 100644
--- a/examples/mesh/manual_networking/README.md
+++ b/examples/mesh/manual_networking/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Mesh Manual Networking Example
 
@@ -9,6 +9,6 @@ This example demonstrates how to scan a list of parent candidates, choose an app
 
 Open project configuration menu (`idf.py menuconfig`) to configure the mesh network channel, router SSID, router password and mesh softAP settings.
 
-When the mesh network is established and if you happen to run this example on ESP-WROVER-KIT boards, the RGB light indicator will show you on which layer devices are. The pink reprents root; the yellow reprents layer 2; the red reprents layer 3; the blue reprents layer 4; the green reprents layer 5; the white reprents layer greater than 5.
+When the mesh network is established and if you happen to run this example on ESP-WROVER-KIT boards, the RGB light indicator will show you on which layer devices are. The pink represents root; the yellow represents layer 2; the red represents layer 3; the blue represents layer 4; the green represents layer 5; the white represents layer greater than 5.
 
 
diff --git a/examples/network/eth2ap/README.md b/examples/network/eth2ap/README.md
index 861ddc872c..20306fa973 100644
--- a/examples/network/eth2ap/README.md
+++ b/examples/network/eth2ap/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # eth2ap Example
 (See the README.md file in the upper level 'examples' directory for more information about examples. To try a more complex application about Ethernet to WiFi data forwarding, please go to [iot-solution](https://github.com/espressif/esp-iot-solution/tree/release/v1.0/examples/eth2wifi).)
@@ -66,7 +66,7 @@ I (538) system_api: Base MAC address is not set, read default base MAC address f
 I (538) system_api: Base MAC address is not set, read default base MAC address from BLK0 of EFUSE
 I (568) wifi: wifi firmware version: ec61a20
 I (568) wifi: config NVS flash: enabled
-I (568) wifi: config nano formating: disabled
+I (568) wifi: config nano formatting: disabled
 I (568) wifi: Init dynamic tx buffer num: 32
 I (568) wifi: Init data frame dynamic rx buffer num: 32
 I (578) wifi: Init management frame dynamic rx buffer num: 32
diff --git a/examples/network/simple_sniffer/README.md b/examples/network/simple_sniffer/README.md
index 4eda0836a9..9503435084 100644
--- a/examples/network/simple_sniffer/README.md
+++ b/examples/network/simple_sniffer/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Simple Sniffer Example
 
@@ -314,8 +314,8 @@ I (130566) cmd_pcap: .pcap file close done
 
 ## Troubleshooting
 
-- Make sure you have pluged in your SD card and mount it into filesystem before doing sniffer work or you will get error message like “Create file /sdcard/sniffer0.pcap failed”.
-- To protect the SD card, we recommand you to execute command `unmount sd` before you plug out your SD card.
+- Make sure you have plugged in your SD card and mount it into filesystem before doing sniffer work or you will get error message like “Create file /sdcard/sniffer0.pcap failed”.
+- To protect the SD card, we recommend you to execute command `unmount sd` before you plug out your SD card.
 - Make sure to run `esp32 apptrace` command before or immediately after a new sniffer task started when you try this example with JTAG. Otherwise the console will issue warning message `waiting for apptrace established` every 1 second. If the apptrace communication doesn't be established within 10 seconds (can be altered by macro `SNIFFER_APPTRACE_RETRY`), this sniffer command will failed with an error message `waiting for apptrace established timeout`.
 
 (For any technical queries, please open an [issue](https://github.com/espressif/esp-idf/issues) on GitHub. We will get back to you as soon as possible.)
diff --git a/examples/network/sta2eth/README.md b/examples/network/sta2eth/README.md
index 9bf63dd42b..8c91e7a477 100644
--- a/examples/network/sta2eth/README.md
+++ b/examples/network/sta2eth/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # WiFi station to "Wired" interface L2 forwarder
 
diff --git a/examples/openthread/.build-test-rules.yml b/examples/openthread/.build-test-rules.yml
index d431fd6861..4b1dc50b25 100644
--- a/examples/openthread/.build-test-rules.yml
+++ b/examples/openthread/.build-test-rules.yml
@@ -20,9 +20,9 @@
 
 examples/openthread/ot_br:
   enable:
-    - if: SOC_WIFI_SUPPORTED == 1
+    - if: SOC_WIFI_SUPPORTED == 1 and IDF_TARGET != "esp32c5"
   disable_test:
-    - if: IDF_TARGET in ["esp32", "esp32c3", "esp32c2", "esp32c6", "esp32s2"]
+    - if: IDF_TARGET in ["esp32", "esp32c3", "esp32c2", "esp32c6", "esp32s2", "esp32c5"]
       temporary: true
       reason: only test on esp32s3
   <<: *openthread_dependencies
diff --git a/examples/provisioning/.build-test-rules.yml b/examples/provisioning/.build-test-rules.yml
index 550cd82588..5c3aa40a22 100644
--- a/examples/provisioning/.build-test-rules.yml
+++ b/examples/provisioning/.build-test-rules.yml
@@ -3,6 +3,7 @@
 examples/provisioning/wifi_prov_mgr:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
+    - if: SOC_BT_SUPPORTED != 1
   disable_test:
     - if: IDF_TARGET != "esp32"
       temporary: true
diff --git a/examples/provisioning/wifi_prov_mgr/README.md b/examples/provisioning/wifi_prov_mgr/README.md
index 62f772c9c9..56ac5b6cbd 100644
--- a/examples/provisioning/wifi_prov_mgr/README.md
+++ b/examples/provisioning/wifi_prov_mgr/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi Provisioning Manager Example
 
diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml
index 0c91cd8448..6662a103c5 100644
--- a/examples/wifi/.build-test-rules.yml
+++ b/examples/wifi/.build-test-rules.yml
@@ -61,6 +61,10 @@ examples/wifi/power_save:
   <<: *wifi_depends_default
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
+  disable_test:
+    - if: IDF_TARGET == "esp32c5"
+      temporary: true
+      reason: lack of runners
   depends_components:
     - esp_driver_uart
 
diff --git a/examples/wifi/espnow/README.md b/examples/wifi/espnow/README.md
index b08a914902..198522d838 100644
--- a/examples/wifi/espnow/README.md
+++ b/examples/wifi/espnow/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # ESPNOW Example
 
diff --git a/examples/wifi/fast_scan/README.md b/examples/wifi/fast_scan/README.md
index faede35c52..2be7009b42 100644
--- a/examples/wifi/fast_scan/README.md
+++ b/examples/wifi/fast_scan/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi Fast Scan Example
 
@@ -57,7 +57,7 @@ As you run the example, you will see the following log:
 I (616) wifi:wifi firmware version: 6bff005
 I (616) wifi:wifi certification version: v7.0
 I (616) wifi:config NVS flash: enabled
-I (616) wifi:config nano formating: disabled
+I (616) wifi:config nano formatting: disabled
 I (626) wifi:Init data frame dynamic rx buffer num: 32
 I (626) wifi:Init management frame dynamic rx buffer num: 32
 I (636) wifi:Init management short buffer num: 32
diff --git a/examples/wifi/ftm/README.md b/examples/wifi/ftm/README.md
index 1928681dfc..a124ac79de 100644
--- a/examples/wifi/ftm/README.md
+++ b/examples/wifi/ftm/README.md
@@ -69,7 +69,7 @@ Issue `ftm -I` to initiate a session with default configuration of 32 FTM frames
 Where -
 * `-I` OR `--ftm_initiator`:  FTM Initiator mode
 * `-c` OR `--frm_count`: FTM frames to be exchanged (Valid values: 0=No preference, 8, 16, 24, 32, 64, default: 32)
-* `-p` OR `--burst_period`: Periodicity of FTM bursts in 100's of miliseconds (0: No preference, default: 2)
+* `-p` OR `--burst_period`: Periodicity of FTM bursts in 100's of milliseconds (0: No preference, default: 2)
 * `-s` OR `--ssid=SSID`: SSID of AP that supports FTM Responder mode
 
 Currently FTM is only supported in below configuration -
diff --git a/examples/wifi/getting_started/softAP/README.md b/examples/wifi/getting_started/softAP/README.md
index 176a4ed8fb..7a7277cfa5 100644
--- a/examples/wifi/getting_started/softAP/README.md
+++ b/examples/wifi/getting_started/softAP/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi SoftAP Example
 
diff --git a/examples/wifi/getting_started/station/README.md b/examples/wifi/getting_started/station/README.md
index f194a1fcba..6a35555d95 100644
--- a/examples/wifi/getting_started/station/README.md
+++ b/examples/wifi/getting_started/station/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi Station Example
 
@@ -46,7 +46,7 @@ I (599) system_api: Base MAC address is not set, read default base MAC address f
 I (599) system_api: Base MAC address is not set, read default base MAC address from BLK0 of EFUSE
 I (629) wifi: wifi firmware version: 2d94f02
 I (629) wifi: config NVS flash: enabled
-I (629) wifi: config nano formating: disabled
+I (629) wifi: config nano formatting: disabled
 I (629) wifi: Init dynamic tx buffer num: 32
 I (629) wifi: Init data frame dynamic rx buffer num: 32
 I (639) wifi: Init management frame dynamic rx buffer num: 32
@@ -79,7 +79,7 @@ I (599) system_api: Base MAC address is not set, read default base MAC address f
 I (599) system_api: Base MAC address is not set, read default base MAC address from BLK0 of EFUSE
 I (629) wifi: wifi firmware version: 2d94f02
 I (629) wifi: config NVS flash: enabled
-I (629) wifi: config nano formating: disabled
+I (629) wifi: config nano formatting: disabled
 I (629) wifi: Init dynamic tx buffer num: 32
 I (629) wifi: Init data frame dynamic rx buffer num: 32
 I (639) wifi: Init management frame dynamic rx buffer num: 32
diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md
index b42b7c4440..5594591fc1 100644
--- a/examples/wifi/iperf/README.md
+++ b/examples/wifi/iperf/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Iperf Example
 
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32c5 b/examples/wifi/iperf/sdkconfig.defaults.esp32c5
index a233704aa6..5f5ad472d8 100644
--- a/examples/wifi/iperf/sdkconfig.defaults.esp32c5
+++ b/examples/wifi/iperf/sdkconfig.defaults.esp32c5
@@ -3,40 +3,40 @@
 #
 CONFIG_IDF_ENV_FPGA=n
 
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=40
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=60
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=40
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=22
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=48
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=48
 CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP_WIFI_TX_BA_WIN=32
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_RX_BA_WIN=22
 CONFIG_ESP_WIFI_NVS_ENABLED=n
 
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=51200
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=57600
 CONFIG_LWIP_TCP_WND_DEFAULT=65535
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=48
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=48
 CONFIG_LWIP_IP_REASS_MAX_PBUFS=15
 
 #
 # Serial flasher config
 #
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
 #
 # Wi-Fi
 #
-CONFIG_ESP_WIFI_ENABLE_WIFI_TX_STATS=n
-CONFIG_ESP_WIFI_ENABLE_WIFI_RX_STATS=n
-CONFIG_ESP_WIFI_ENABLE_WIFI_RX_MU_STATS=n
+CONFIG_ESP_WIFI_ENABLE_WIFI_TX_STATS=y
+CONFIG_ESP_WIFI_ENABLE_WIFI_RX_STATS=y
+CONFIG_ESP_WIFI_ENABLE_WIFI_RX_MU_STATS=y
 CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB=n
 CONFIG_ESP_WIFI_ENABLE_DUMP_MU_CFO=n
 CONFIG_ESP_WIFI_ENABLE_DUMP_CTRL_NDPA=n
 CONFIG_ESP_WIFI_ENABLE_DUMP_CTRL_BFRP=n
 CONFIG_ESP_WIFI_SLP_IRAM_OPT=n
-CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION=y
+CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION=n
 
 CONFIG_LWIP_TCPIP_CORE_LOCKING=y
 CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
diff --git a/examples/wifi/itwt/README.md b/examples/wifi/itwt/README.md
index 265fe586af..49ba38a5c2 100644
--- a/examples/wifi/itwt/README.md
+++ b/examples/wifi/itwt/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C6 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 |
+| ----------------- | -------- | -------- |
 
 # Wifi itwt Example
 
diff --git a/examples/wifi/power_save/README.md b/examples/wifi/power_save/README.md
index 95e01f1acd..50df4b8e6e 100644
--- a/examples/wifi/power_save/README.md
+++ b/examples/wifi/power_save/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wifi Power Save Example
 
diff --git a/examples/wifi/roaming/roaming_11kvr/README.md b/examples/wifi/roaming/roaming_11kvr/README.md
index 77b69d89fe..024d06cc55 100644
--- a/examples/wifi/roaming/roaming_11kvr/README.md
+++ b/examples/wifi/roaming/roaming_11kvr/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Roaming Example
 
diff --git a/examples/wifi/roaming/roaming_app/README.md b/examples/wifi/roaming/roaming_app/README.md
index dfe1b1d1c4..5484547e09 100644
--- a/examples/wifi/roaming/roaming_app/README.md
+++ b/examples/wifi/roaming/roaming_app/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi Station Example
 
diff --git a/examples/wifi/scan/README.md b/examples/wifi/scan/README.md
index 38b1f8fbfa..44fe4c7fe7 100644
--- a/examples/wifi/scan/README.md
+++ b/examples/wifi/scan/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi Scan Example
 
diff --git a/examples/wifi/smart_config/README.md b/examples/wifi/smart_config/README.md
index 1072af0fbc..822c52226b 100644
--- a/examples/wifi/smart_config/README.md
+++ b/examples/wifi/smart_config/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # smartconfig Example
 
diff --git a/examples/wifi/softap_sta/README.md b/examples/wifi/softap_sta/README.md
index 40eb5ee266..21a5098a2a 100644
--- a/examples/wifi/softap_sta/README.md
+++ b/examples/wifi/softap_sta/README.md
@@ -1,12 +1,12 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi SoftAP & Station Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
 
 This example demonstrates how to use the ESP Wi-Fi driver to act as both an Access Point and a Station simultaneously using the SoftAP and Station features.
-With NAPT enabled on the softAP interface and the station interface set as the defaut interface this example can be used as Wifi nat router.
+With NAPT enabled on the softAP interface and the station interface set as the default interface this example can be used as Wifi nat router.
 
 ## How to use example
 ### Configure the project
diff --git a/examples/wifi/wifi_eap_fast/README.md b/examples/wifi/wifi_eap_fast/README.md
index b79953bbcd..670c852fcf 100644
--- a/examples/wifi/wifi_eap_fast/README.md
+++ b/examples/wifi/wifi_eap_fast/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # WPA2 Enterprise Example
 
diff --git a/examples/wifi/wifi_easy_connect/dpp-enrollee/README.md b/examples/wifi/wifi_easy_connect/dpp-enrollee/README.md
index c3ff6a0b4b..5e6740aa28 100644
--- a/examples/wifi/wifi_easy_connect/dpp-enrollee/README.md
+++ b/examples/wifi/wifi_easy_connect/dpp-enrollee/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Device Provisioning Protocol (Enrollee) Example
 
diff --git a/examples/wifi/wifi_enterprise/README.md b/examples/wifi/wifi_enterprise/README.md
index 6522f19494..06404b82c5 100644
--- a/examples/wifi/wifi_enterprise/README.md
+++ b/examples/wifi/wifi_enterprise/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 
 # Understanding different WiFi enterprise modes:
@@ -55,7 +55,7 @@ idf.py -p PORT flash monitor
 
 ## Steps to create enterprise openssl certs
 
-1. make directry tree
+1. make directory tree
 ```
   mkdir demoCA
   mkdir demoCA/newcerts
@@ -86,7 +86,7 @@ idf.py -p PORT flash monitor
   openssl req -new -key client.key -out client.csr
   openssl req -new -key server.key -out server.csr
 ```
-5. create certs (.crt) for client nd server
+5. create certs (.crt) for client and server
 ```
   openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key (password) -out client.crt -extensions xpclient_ext -extfile xpextensions
   openssl ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key (password) -out server.crt -extensions xpserver_ext -extfile xpextensions
@@ -158,7 +158,7 @@ I (635) wifi:wifi driver task: 3ffbf930, prio:23, stack:6656, core=0
 I (635) wifi:wifi firmware version: e03c1ca
 I (635) wifi:wifi certification version: v7.0
 I (635) wifi:config NVS flash: enabled
-I (635) wifi:config nano formating: disabled
+I (635) wifi:config nano formatting: disabled
 I (645) wifi:Init data frame dynamic rx buffer num: 32
 I (645) wifi:Init management frame dynamic rx buffer num: 32
 I (655) wifi:Init management short buffer num: 32
diff --git a/examples/wifi/wps/README.md b/examples/wifi/wps/README.md
index 63c44dd6ef..089f1fd0f1 100644
--- a/examples/wifi/wps/README.md
+++ b/examples/wifi/wps/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi WPS Example
 
diff --git a/examples/wifi/wps_softap_registrar/README.md b/examples/wifi/wps_softap_registrar/README.md
index b8d8d98dad..1af61b74d8 100644
--- a/examples/wifi/wps_softap_registrar/README.md
+++ b/examples/wifi/wps_softap_registrar/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wi-Fi WPS Registrar Example
 
diff --git a/examples/zigbee/.build-test-rules.yml b/examples/zigbee/.build-test-rules.yml
index ecffa999bd..7f14991ad8 100644
--- a/examples/zigbee/.build-test-rules.yml
+++ b/examples/zigbee/.build-test-rules.yml
@@ -8,8 +8,8 @@
 
 examples/zigbee/esp_zigbee_gateway:
   enable:
-    - if: SOC_WIFI_SUPPORTED == 1 and IDF_TARGET != "esp32c2"
-      reason: not supported esp32c2
+    - if: SOC_WIFI_SUPPORTED == 1 and IDF_TARGET not in ["esp32c2", "esp32c5"]
+      reason: not supported esp32c2 and esp32c5
   <<: *zigbee_dependencies
 
 examples/zigbee/esp_zigbee_rcp:
diff --git a/tools/test_apps/peripherals/.build-test-rules.yml b/tools/test_apps/peripherals/.build-test-rules.yml
index c62ccdbdc5..804db98e17 100644
--- a/tools/test_apps/peripherals/.build-test-rules.yml
+++ b/tools/test_apps/peripherals/.build-test-rules.yml
@@ -3,3 +3,6 @@
 tools/test_apps/peripherals/i2c_wifi:
   disable:
     - if: SOC_I2C_SUPPORTED != 1 or SOC_WIFI_SUPPORTED != 1
+  disable_test:
+    - if: IDF_TARGET in ["esp32c5"]
+      reason: leak of runner
diff --git a/tools/test_apps/peripherals/i2c_wifi/README.md b/tools/test_apps/peripherals/i2c_wifi/README.md
index a5412d113b..e2fe908965 100644
--- a/tools/test_apps/peripherals/i2c_wifi/README.md
+++ b/tools/test_apps/peripherals/i2c_wifi/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # I2C-WIFI Test
 
@@ -73,7 +73,7 @@ I (379) system_api: read default base MAC address from EFUSE
 I (379) wifi:wifi firmware version: d062fdb
 I (389) wifi:wifi certification version: v7.0
 I (389) wifi:config NVS flash: enabled
-I (389) wifi:config nano formating: disabled
+I (389) wifi:config nano formatting: disabled
 I (399) wifi:Init data frame dynamic rx buffer num: 32
 I (399) wifi:Init management frame dynamic rx buffer num: 32
 I (409) wifi:Init management short buffer num: 32
diff --git a/tools/test_apps/phy/.build-test-rules.yml b/tools/test_apps/phy/.build-test-rules.yml
index 9dcdbb7636..a6620cc9d1 100644
--- a/tools/test_apps/phy/.build-test-rules.yml
+++ b/tools/test_apps/phy/.build-test-rules.yml
@@ -3,6 +3,9 @@
 tools/test_apps/phy/phy_multi_init_data_test:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
+  disable_test:
+    - if: IDF_TARGET in ["esp32c5"]
+      reason: leak of runner
 
 tools/test_apps/phy/phy_tsens:
   disable:
diff --git a/tools/test_apps/phy/phy_multi_init_data_test/README.md b/tools/test_apps/phy/phy_multi_init_data_test/README.md
index 7e7523ec85..0c839f750c 100644
--- a/tools/test_apps/phy/phy_multi_init_data_test/README.md
+++ b/tools/test_apps/phy/phy_multi_init_data_test/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
diff --git a/tools/test_apps/system/.build-test-rules.yml b/tools/test_apps/system/.build-test-rules.yml
index b11db03fab..83cb588244 100644
--- a/tools/test_apps/system/.build-test-rules.yml
+++ b/tools/test_apps/system/.build-test-rules.yml
@@ -13,7 +13,7 @@ tools/test_apps/system/build_test:
 
 tools/test_apps/system/clang_build_test:
   enable:
-    - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3", "esp32c2", "esp32c3", "esp32c5", "esp32c6", "esp32h2", "esp32p4"]
+    - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"]
       temporary: true
       reason: the other targets are not supported yet
 
diff --git a/tools/test_apps/system/clang_build_test/README.md b/tools/test_apps/system/clang_build_test/README.md
index c410436a3a..5b165ee322 100644
--- a/tools/test_apps/system/clang_build_test/README.md
+++ b/tools/test_apps/system/clang_build_test/README.md
@@ -1,4 +1,4 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 This project is for testing if the application can be built with Clang toolchain.