diff --git a/docs/en/developing.rst b/docs/en/developing.rst
index fa3ae9a88..9acf0e09c 100644
--- a/docs/en/developing.rst
+++ b/docs/en/developing.rst
@@ -217,7 +217,7 @@ Choose IDF target.
     -  ESP32-C6 supports both the Wi-Fi and IEEE 802.15.4 radio, so you can run Wi-Fi or Thread matter example on it.
 
         -  To enable Thread, you should change the menuconfig options to ``CONFIG_OPENTHREAD_ENABLED=y``, ``CONFIG_ENABLE_WIFI_STATION=n``, and  ``CONFIG_USE_MINIMAL_MDNS=n``.
-        -  To enable Wi-Fi. you should change the menuconfig options to ``CONFIG_OPENTHREAD_ENABLED=n``, ``CONFIG_ENABLE_WIFI_STATION=n``, and ``CONFIG_USE_MINIMAL_MDNS=y``.
+        -  To enable Wi-Fi. you should change the menuconfig options to ``CONFIG_OPENTHREAD_ENABLED=n``, ``CONFIG_ENABLE_WIFI_STATION=y``, and ``CONFIG_USE_MINIMAL_MDNS=y``.
 
 (When flashing the SDK for the first time, it is recommended to do
 ``idf.py erase_flash`` to wipe out entire flash and start out fresh.)
diff --git a/examples/generic_switch/partitions_c6.csv b/examples/generic_switch/partitions_thread.csv
similarity index 91%
rename from examples/generic_switch/partitions_c6.csv
rename to examples/generic_switch/partitions_thread.csv
index 8056fc3cc..af05f427a 100644
--- a/examples/generic_switch/partitions_c6.csv
+++ b/examples/generic_switch/partitions_thread.csv
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, ,          0x1000, encrypted
 phy_init,  data, phy,     ,          0x1000,
 ota_0,    app, ota_0,     ,          0x1C0000,
 ota_1,    app, ota_1,     ,          0x1C0000,
+# For Wi-Fi device, this partition can be deleted.
 ot_storage,data, fat,     ,          0x6000,
diff --git a/examples/generic_switch/sdkconfig.defaults.esp32c6 b/examples/generic_switch/sdkconfig.defaults.esp32c6
index 207d09f63..862c7c93a 100644
--- a/examples/generic_switch/sdkconfig.defaults.esp32c6
+++ b/examples/generic_switch/sdkconfig.defaults.esp32c6
@@ -35,7 +35,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c6.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/generic_switch/sdkconfig.defaults.esp32h2 b/examples/generic_switch/sdkconfig.defaults.esp32h2
index d3108eb3b..246e5bbdd 100644
--- a/examples/generic_switch/sdkconfig.defaults.esp32h2
+++ b/examples/generic_switch/sdkconfig.defaults.esp32h2
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/generic_switch/partitions_h2.csv b/examples/light/partitions_thread.csv
similarity index 91%
rename from examples/generic_switch/partitions_h2.csv
rename to examples/light/partitions_thread.csv
index 8056fc3cc..af05f427a 100644
--- a/examples/generic_switch/partitions_h2.csv
+++ b/examples/light/partitions_thread.csv
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, ,          0x1000, encrypted
 phy_init,  data, phy,     ,          0x1000,
 ota_0,    app, ota_0,     ,          0x1C0000,
 ota_1,    app, ota_1,     ,          0x1C0000,
+# For Wi-Fi device, this partition can be deleted.
 ot_storage,data, fat,     ,          0x6000,
diff --git a/examples/light/sdkconfig.defaults.esp32c6 b/examples/light/sdkconfig.defaults.esp32c6
index c4e3aa0ab..baace9813 100644
--- a/examples/light/sdkconfig.defaults.esp32c6
+++ b/examples/light/sdkconfig.defaults.esp32c6
@@ -30,7 +30,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/light/sdkconfig.defaults.esp32h2 b/examples/light/sdkconfig.defaults.esp32h2
index d3108eb3b..246e5bbdd 100644
--- a/examples/light/sdkconfig.defaults.esp32h2
+++ b/examples/light/sdkconfig.defaults.esp32h2
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/light/partitions_h2.csv b/examples/light_switch/partitions_thread.csv
similarity index 91%
rename from examples/light/partitions_h2.csv
rename to examples/light_switch/partitions_thread.csv
index 8056fc3cc..af05f427a 100644
--- a/examples/light/partitions_h2.csv
+++ b/examples/light_switch/partitions_thread.csv
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, ,          0x1000, encrypted
 phy_init,  data, phy,     ,          0x1000,
 ota_0,    app, ota_0,     ,          0x1C0000,
 ota_1,    app, ota_1,     ,          0x1C0000,
+# For Wi-Fi device, this partition can be deleted.
 ot_storage,data, fat,     ,          0x6000,
diff --git a/examples/light_switch/sdkconfig.defaults.esp32c6 b/examples/light_switch/sdkconfig.defaults.esp32c6
index 207d09f63..862c7c93a 100644
--- a/examples/light_switch/sdkconfig.defaults.esp32c6
+++ b/examples/light_switch/sdkconfig.defaults.esp32c6
@@ -35,7 +35,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c6.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/light_switch/sdkconfig.defaults.esp32h2 b/examples/light_switch/sdkconfig.defaults.esp32h2
index d3108eb3b..246e5bbdd 100644
--- a/examples/light_switch/sdkconfig.defaults.esp32h2
+++ b/examples/light_switch/sdkconfig.defaults.esp32h2
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/zap_light/partitions_h2.csv b/examples/zap_light/partitions_h2.csv
deleted file mode 100644
index 8056fc3cc..000000000
--- a/examples/zap_light/partitions_h2.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
-esp_secure_cert,  0x3F, ,0xd000,     0x2000, encrypted
-nvs,       data, nvs,     0x10000,   0x6000,
-nvs_keys, data, nvs_keys, ,          0x1000, encrypted
-phy_init,  data, phy,     ,          0x1000,
-ota_0,    app, ota_0,     ,          0x1C0000,
-ota_1,    app, ota_1,     ,          0x1C0000,
-ot_storage,data, fat,     ,          0x6000,
diff --git a/examples/light_switch/partitions_h2.csv b/examples/zap_light/partitions_thread.csv
similarity index 91%
rename from examples/light_switch/partitions_h2.csv
rename to examples/zap_light/partitions_thread.csv
index 8056fc3cc..af05f427a 100644
--- a/examples/light_switch/partitions_h2.csv
+++ b/examples/zap_light/partitions_thread.csv
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, ,          0x1000, encrypted
 phy_init,  data, phy,     ,          0x1000,
 ota_0,    app, ota_0,     ,          0x1C0000,
 ota_1,    app, ota_1,     ,          0x1C0000,
+# For Wi-Fi device, this partition can be deleted.
 ot_storage,data, fat,     ,          0x6000,
diff --git a/examples/zap_light/sdkconfig.defaults.esp32h2 b/examples/zap_light/sdkconfig.defaults.esp32h2
index d3108eb3b..246e5bbdd 100644
--- a/examples/zap_light/sdkconfig.defaults.esp32h2
+++ b/examples/zap_light/sdkconfig.defaults.esp32h2
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8