diff --git a/platformio.ini b/platformio.ini
index c2940f44..3bd80b57 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -40,8 +40,9 @@ extra_scripts = merge-bin.py
 build_flags = ${arduino_base.build_flags}
 ;  -D ESP32_CPU_FREQ=80          ; change it to your need
 build_src_filter = ${arduino_base.build_src_filter}
+
+[esp32_ota]
 lib_deps =
-  ${arduino_base.lib_deps}
   me-no-dev/ESPAsyncWebServer @ ^3.6.0
   file://arch/esp32/AsyncElegantOTA
 
diff --git a/src/helpers/ESP32Board.cpp b/src/helpers/ESP32Board.cpp
index 1eb1cdb9..57838d32 100644
--- a/src/helpers/ESP32Board.cpp
+++ b/src/helpers/ESP32Board.cpp
@@ -1,6 +1,8 @@
 #ifdef ESP_PLATFORM
 
 #include "ESP32Board.h"
+
+#if defined(ADMIN_PASSWORD)   // Repeater or Room Server only
 #include <WiFi.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
@@ -29,4 +31,11 @@ bool ESP32Board::startOTAUpdate(const char* id, char reply[]) {
 
   return true;
 }
+
+#else
+bool ESP32Board::startOTAUpdate(const char* id, char reply[]) {
+  return false; // not supported
+}
+#endif
+
 #endif
diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini
index 117432bf..cfca7fee 100644
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -33,6 +33,9 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<../examples/simple_repeater>
   +<helpers/ui/*.cpp>
+lib_deps =
+  ${Heltec_lora32_v2.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Heltec_v2_room_server]
 extends = Heltec_lora32_v2
@@ -49,6 +52,9 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<helpers/ui/*.cpp>
   +<../examples/simple_room_server>
+lib_deps =
+  ${Heltec_lora32_v2.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Heltec_v2_terminal_chat]
 extends = Heltec_lora32_v2
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index bfd7accb..cfe8f264 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -36,6 +36,9 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<helpers/ui/*.cpp>
   +<../examples/simple_repeater>
+lib_deps =
+  ${Heltec_lora32_v3.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Heltec_v3_room_server]
 extends = Heltec_lora32_v3
@@ -52,6 +55,9 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<helpers/ui/*.cpp>
   +<../examples/simple_room_server>
+lib_deps =
+  ${Heltec_lora32_v3.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Heltec_v3_terminal_chat]
 extends = Heltec_lora32_v3
@@ -140,6 +146,9 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<../examples/simple_repeater>
+lib_deps =
+  ${Heltec_lora32_v3.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Heltec_WSL3_room_server]
 extends = Heltec_lora32_v3
@@ -154,6 +163,9 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+lib_deps =
+  ${Heltec_lora32_v3.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Heltec_WSL3_companion_radio_ble]
 extends = Heltec_lora32_v3
diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini
index 698d7c86..59ed60b4 100644
--- a/variants/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -47,6 +47,9 @@ build_flags =
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
   +<helpers/ui/*.cpp>
   +<../examples/simple_repeater>
+lib_deps =
+  ${LilyGo_T3S3_sx1262.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:LilyGo_T3S3_sx1262_terminal_chat]
 extends = LilyGo_T3S3_sx1262
@@ -77,6 +80,9 @@ build_flags =
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
   +<helpers/ui/*.cpp>
   +<../examples/simple_room_server>
+lib_deps =
+  ${LilyGo_T3S3_sx1262.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:LilyGo_T3S3_sx1262_companion_radio_usb]
 extends = LilyGo_T3S3_sx1262
diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini
index 017857d6..f7485f9c 100644
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@@ -45,6 +45,9 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 ;  -D CORE_DEBUG_LEVEL=3
+lib_deps =
+  ${LilyGo_TLora_V2_1_1_6.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:LilyGo_TLora_V2_1_1_6_terminal_chat]
 extends = LilyGo_TLora_V2_1_1_6
@@ -112,3 +115,6 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+lib_deps =
+  ${LilyGo_TLora_V2_1_1_6.lib_deps}
+  ${esp32_ota.lib_deps}
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index e11cb0a1..96eca1c4 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -34,6 +34,9 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
   +<../examples/simple_repeater>
+lib_deps =
+  ${Station_G2.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Station_G2_room_server]
 extends = Station_G2
@@ -48,3 +51,6 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+lib_deps =
+  ${Station_G2.lib_deps}
+  ${esp32_ota.lib_deps}
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index b66c238f..77c9eae7 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -35,6 +35,9 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_esp32_C3.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Xiao_C3_Repeater_sx1268]
 extends = Xiao_esp32_C3
@@ -51,3 +54,6 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
  ; -D MESH_PACKET_LOGGING=1
  ; -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_esp32_C3.lib_deps}
+  ${esp32_ota.lib_deps}
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index 7255f8f2..083f8a16 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -35,6 +35,9 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_S3_WIO.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Xiao_S3_WIO_terminal_chat]
 extends = Xiao_S3_WIO