diff --git a/variants/esp32h2/esp32h2.ini b/variants/esp32h2/esp32h2.ini
index ca325c321..5579f7181 100644
--- a/variants/esp32h2/esp32h2.ini
+++ b/variants/esp32h2/esp32h2.ini
@@ -1,38 +1,14 @@
 [esp32h2_base]
 extends = esp32_base
-platform =
-  # Do not renovate until we have switched to pioarduino tagged builds
-  https://github.com/Jason2866/platform-espressif32/archive/39475a7213fa3a52b0c2048d1a31c215fc85fcf8.zip
-build_flags =
-  ${arduino_base.build_flags}
-  -Wall
-  -Wextra
-  -Isrc/platform/esp32
-  -std=c++11
-  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  -DSERIAL_BUFFER_SIZE=4096
-  -DLIBPAX_ARDUINO
-  -DLIBPAX_WIFI
-  -DLIBPAX_BLE
-  -DMESHTASTIC_EXCLUDE_WEBSERVER
-  ;-DDEBUG_HEAP
-  ; TEMP
-  -DHAS_BLUETOOTH=0
-  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+custom_esp32_kind = esp32h2
 
-lib_deps =
-  ${arduino_base.lib_deps}
-  ${networking_base.lib_deps}
-  ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
-  ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.1
-  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+build_flags =
+  ${esp32_base.build_flags}
+  -DHAS_WIFI=0
+  -DMESHTASTIC_EXCLUDE_WIFI=1 ; TODO
+  -DMESHTASTIC_EXCLUDE_MQTT=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
 
 build_src_filter = 
  ${esp32_base.build_src_filter} -<mesh/http> 
@@ -41,7 +17,7 @@ monitor_speed = 460800
 monitor_filters = esp32_h2_exception_decoder
 
 lib_ignore =
-  NonBlockingRTTTL
-  NimBLE-Arduino
+  ${esp32_common.lib_ignore}
   libpax
-  
+  esp32_idf5_https_server
+  esp_http_server
diff --git a/variants/esp32h2/waveshare-esp32-h2/platformio.ini b/variants/esp32h2/waveshare-esp32-h2/platformio.ini
index 10f7ae53e..f29383ec6 100644
--- a/variants/esp32h2/waveshare-esp32-h2/platformio.ini
+++ b/variants/esp32h2/waveshare-esp32-h2/platformio.ini
@@ -3,9 +3,8 @@ extends = esp32h2_base
 board = esp32-h2-devkitm-1
 board_build.f_flash = 16000000L
 board_level = pr
-build_flags = 
+build_flags =
   ${esp32h2_base.build_flags}
   -I variants/esp32h2/waveshare-esp32-h2
   -DARDUINO_USB_CDC_ON_BOOT=1
   -DARDUINO_USB_MODE=1
-  -DHAS_WIFI=0
diff --git a/variants/esp32h2/waveshare-esp32-h2/variant.h b/variants/esp32h2/waveshare-esp32-h2/variant.h
index 3c16b7a1a..34110c4e0 100644
--- a/variants/esp32h2/waveshare-esp32-h2/variant.h
+++ b/variants/esp32h2/waveshare-esp32-h2/variant.h
@@ -1,10 +1,9 @@
 
 #define HAS_SCREEN 0
-#define HAS_WIFI 0
 
 #define SERIAL_PRINT_PORT 1
 
 #define LORA_SCK 4
 #define LORA_MISO 3
 #define LORA_MOSI 2
-#define LORA_CS 1
\ No newline at end of file
+#define LORA_CS 1