diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml
index de2d27dbb4..340a9a724c 100644
--- a/examples/protocols/.build-test-rules.yml
+++ b/examples/protocols/.build-test-rules.yml
@@ -193,6 +193,10 @@ examples/protocols/mqtt/ssl_psk:
   <<: *mqtt_dependencies
 examples/protocols/mqtt/tcp:
   <<: *mqtt_dependencies
+  disable+:
+    - if: IDF_TARGET in ["esp32p4", "esp32h2"]
+      temporary: true
+      reason: need to update esp_wifi_remote component to support idf-v6.0
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
diff --git a/examples/protocols/mqtt/tcp/README.md b/examples/protocols/mqtt/tcp/README.md
index cb9f2cca07..b77bfea24a 100644
--- a/examples/protocols/mqtt/tcp/README.md
+++ b/examples/protocols/mqtt/tcp/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
 
 # ESP-MQTT sample application
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml
index f08a88aaa5..46164a8d84 100644
--- a/examples/wifi/.build-test-rules.yml
+++ b/examples/wifi/.build-test-rules.yml
@@ -36,6 +36,9 @@ examples/wifi/iperf:
   disable:
     - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1)
     - if: (IDF_TARGET == "esp32p4") and CONFIG_NAME in ["defaults", "99"]
+    - if: IDF_TARGET in ["esp32p4", "esp32h2"]
+      temporary: true
+      reason: need to update esp_wifi_remote component to support idf-v6.0
   disable_test:
     - if: IDF_TARGET not in ["esp32"]
       temporary: true
diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md
index cdebd8865e..1b86f94ccd 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-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
 
 # Iperf Example