diff --git a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.yaml b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.yaml
index 45b4c8f36f3..09f0cc51361 100644
--- a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.yaml
+++ b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.yaml
@@ -3,4 +3,8 @@ name: ESP32-C3
 type: mcu
 arch: riscv
 toolchain:
-  - espressif
+  - zephyr
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/xtensa/esp32/esp32.yaml b/boards/xtensa/esp32/esp32.yaml
index c6b3147636f..b2a1165486e 100644
--- a/boards/xtensa/esp32/esp32.yaml
+++ b/boards/xtensa/esp32/esp32.yaml
@@ -3,7 +3,7 @@ name: ESP-32
 type: mcu
 arch: xtensa
 toolchain:
-  - espressif
+  - zephyr
 supported:
   - gpio
   - i2c
@@ -11,3 +11,7 @@ supported:
   - uart
   - pinmux
   - nvs
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/xtensa/esp32s2_saola/esp32s2_saola.yaml b/boards/xtensa/esp32s2_saola/esp32s2_saola.yaml
index f7581cfdb29..bf09c41d930 100644
--- a/boards/xtensa/esp32s2_saola/esp32s2_saola.yaml
+++ b/boards/xtensa/esp32s2_saola/esp32s2_saola.yaml
@@ -3,4 +3,8 @@ name: ESP32-S2
 type: mcu
 arch: xtensa
 toolchain:
-  - espressif
+  - zephyr
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/xtensa/esp_wrover_kit/esp_wrover_kit.yaml b/boards/xtensa/esp_wrover_kit/esp_wrover_kit.yaml
index 92d1a2c6472..3f88208f69e 100644
--- a/boards/xtensa/esp_wrover_kit/esp_wrover_kit.yaml
+++ b/boards/xtensa/esp_wrover_kit/esp_wrover_kit.yaml
@@ -3,7 +3,7 @@ name: ESP WROVER KIT
 type: mcu
 arch: xtensa
 toolchain:
-  - espressif
+  - zephyr
 supported:
   - gpio
   - i2c
@@ -12,3 +12,7 @@ supported:
   - uart
   - pinmux
   - nvs
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2.yaml b/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2.yaml
index 2e44f0bdbb9..2f1dc1f20cc 100644
--- a/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2.yaml
+++ b/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2.yaml
@@ -3,7 +3,7 @@ name: HELTEC WiFi LoRa 32 (V2) Board
 type: mcu
 arch: xtensa
 toolchain:
-  - espressif
+  - zephyr
 supported:
   - gpio
   - i2c
@@ -11,3 +11,7 @@ supported:
   - uart
   - pinmux
   - nvs
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/xtensa/odroid_go/odroid_go.yaml b/boards/xtensa/odroid_go/odroid_go.yaml
index 9a8accf5601..08d4ed13242 100644
--- a/boards/xtensa/odroid_go/odroid_go.yaml
+++ b/boards/xtensa/odroid_go/odroid_go.yaml
@@ -3,7 +3,7 @@ name: ODROID-GO
 type: mcu
 arch: xtensa
 toolchain:
-  - espressif
+  - zephyr
 supported:
   - gpio
   - i2c
@@ -11,3 +11,7 @@ supported:
   - uart
   - pinmux
   - nvs
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.yaml b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.yaml
index 025550438eb..42d5cc3099f 100644
--- a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.yaml
+++ b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.yaml
@@ -3,13 +3,16 @@ name: Olimex ESP32-EVB
 type: mcu
 arch: xtensa
 toolchain:
-  - espressif
+  - zephyr
 supported:
   - counter
   - gpio
   - hwinfo
   - i2c
-  - netif:wifi
   - spi
   - uart
   - watchdog
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/west.yml b/west.yml
index 9586de902b7..eb626dd58b7 100644
--- a/west.yml
+++ b/west.yml
@@ -70,7 +70,7 @@ manifest:
       groups:
         - hal
     - name: hal_espressif
-      revision: a7dc3c72291a387e0eb3b268d07df6eb70811a84
+      revision: 83d01afcea5ac1a6c1f7c06dadbdc9ca5ee9ee09
       path: modules/hal/espressif
       west-commands: west/west-commands.yml
       groups: