diff --git a/include/hasp_conf.h b/include/hasp_conf.h
index 519bb2d4..ed098cc7 100644
--- a/include/hasp_conf.h
+++ b/include/hasp_conf.h
@@ -53,8 +53,8 @@
 #define HASP_HAS_NETWORK                                                                                               \
     (ARDUINO_ARCH_ESP32 > 0 || ARDUINO_ARCH_ESP8266 > 0 || HASP_USE_ETHERNET > 0 || HASP_USE_WIFI > 0)
 
-#ifndef HASP_USE_OTA
-#define HASP_USE_OTA 0 //(HASP_HAS_NETWORK)
+#ifndef HASP_USE_ARDUINOOTA
+#define HASP_USE_ARDUINOOTA 0 //(HASP_HAS_NETWORK)
 #endif
 
 #ifndef HASP_USE_HTTP_UPDATE
@@ -303,7 +303,7 @@ static WiFiSpiClass WiFi;
 #include "sys/svc/hasp_mdns.h"
 #endif
 
-#if HASP_USE_OTA > 0 || HASP_USE_HTTP_UPDATE > 0
+#if HASP_USE_ARDUINOOTA > 0 || HASP_USE_HTTP_UPDATE > 0
 #include "sys/svc/hasp_ota.h"
 #endif
 
diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp
index 7cdb71be..ecc189a4 100644
--- a/src/hasp/hasp_dispatch.cpp
+++ b/src/hasp/hasp_dispatch.cpp
@@ -535,7 +535,7 @@ void dispatch_config(const char* topic, const char* payload, uint8_t source)
             httpGetConfig(settings);
     }
 #endif
-#if HASP_USE_OTA > 0 || HASP_USE_HTTP_UPDATE > 0
+#if HASP_USE_ARDUINOOTA > 0 || HASP_USE_HTTP_UPDATE > 0
     else if(strcasecmp_P(topic, PSTR("ota")) == 0) {
         if(update)
             otaSetConfig(settings);
diff --git a/src/main_arduino.cpp b/src/main_arduino.cpp
index b5f6fd2b..c021b53e 100644
--- a/src/main_arduino.cpp
+++ b/src/main_arduino.cpp
@@ -86,7 +86,7 @@ void setup()
     mdnsSetup();
 #endif
 
-#if HASP_USE_OTA > 0 || HASP_USE_HTTP_UPDATE > 0
+#if HASP_USE_ARDUINOOTA > 0 || HASP_USE_HTTP_UPDATE > 0
     otaSetup();
 #endif
 
diff --git a/src/main_sdl2.cpp b/src/main_sdl2.cpp
index c7f3a97e..19fc6269 100644
--- a/src/main_sdl2.cpp
+++ b/src/main_sdl2.cpp
@@ -174,7 +174,7 @@ void loop()
         haspEverySecond();     // sleep timer
         dispatchEverySecond(); // sleep timer
 
-#if HASP_USE_OTA > 0
+#if HASP_USE_ARDUINOOTA > 0
         otaEverySecond(); // progressbar
 #endif
 
diff --git a/src/sys/net/hasp_network.cpp b/src/sys/net/hasp_network.cpp
index 2ce5262d..e17670c2 100644
--- a/src/sys/net/hasp_network.cpp
+++ b/src/sys/net/hasp_network.cpp
@@ -70,7 +70,7 @@ IRAM_ATTR void networkLoop(void)
     httpLoop();
 #endif // HTTP
 
-#if HASP_USE_OTA > 0
+#if HASP_USE_ARDUINOOTA > 0
     otaLoop();
 #endif // OTA
 
@@ -112,7 +112,7 @@ bool networkEvery5Seconds(void)
     // connected |= wifiEverySecond();
 #endif
 
-#if HASP_USE_OTA > 0
+#if HASP_USE_ARDUINOOTA > 0
     otaEverySecond(); // progressbar
 #endif
 
diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp
index 9019cf37..f52cb692 100644
--- a/src/sys/svc/hasp_http.cpp
+++ b/src/sys/svc/hasp_http.cpp
@@ -531,7 +531,7 @@ static void webHandleApiConfig()
             httpSetConfig(settings);
         } else
 #endif
-#if HASP_USE_OTA > 0 || HASP_USE_HTTP_UPDATE > 0
+#if HASP_USE_ARDUINOOTA > 0 || HASP_USE_HTTP_UPDATE > 0
             if(!strcasecmp_P(endpoint_key, PSTR("ota"))) {
             otaSetConfig(settings);
         } else
@@ -567,7 +567,7 @@ static void webHandleApiConfig()
         httpGetConfig(settings);
     } else
 #endif
-#if HASP_USE_OTA > 0 || HASP_USE_HTTP_UPDATE > 0
+#if HASP_USE_ARDUINOOTA > 0 || HASP_USE_HTTP_UPDATE > 0
         if(!strcasecmp_P(endpoint_key, PSTR("ota"))) {
         otaGetConfig(settings);
     } else
diff --git a/src/sys/svc/hasp_ota.cpp b/src/sys/svc/hasp_ota.cpp
index e23ccc67..e88ad8c8 100644
--- a/src/sys/svc/hasp_ota.cpp
+++ b/src/sys/svc/hasp_ota.cpp
@@ -85,7 +85,7 @@ void otaSetup(void)
     //  Reading data over SSL may be slow, use an adequate timeout
     secureClient.setTimeout(12); // timeout argument is defined in seconds
 
-#if HASP_USE_OTA > 0
+#if HASP_USE_ARDUINOOTA > 0
     if(strlen(otaUrl.c_str())) {
         LOG_INFO(TAG_OTA, otaUrl.c_str());
     }
@@ -97,7 +97,6 @@ void otaSetup(void)
         ArduinoOTA.onError(ota_on_error);
 
         ArduinoOTA.setHostname(haspDevice.get_hostname());
-        // ArduinoOTA.setPassword(configPassword); // See OTA_PASSWORD
         ArduinoOTA.setPort(arduinoOtaPort);
 
 #if ESP32
@@ -118,7 +117,7 @@ void otaSetup(void)
     } else {
         LOG_WARNING(TAG_OTA, F(D_SERVICE_DISABLED));
     }
-#endif // HASP_USE_OTA
+#endif // HASP_USE_ARDUINOOTA
 }
 
 bool otaUpdateCheck()
@@ -179,7 +178,7 @@ static void ota_on_start(void)
     otaPrecentageComplete = 0;
 }
 
-#if HASP_USE_OTA > 0
+#if HASP_USE_ARDUINOOTA > 0
 static void ota_on_end(void)
 {
     otaPrecentageComplete = 100;
@@ -236,7 +235,7 @@ void otaEverySecond(void)
 {
     if(otaPrecentageComplete >= 0) otaProgress();
 }
-#endif // HASP_USE_OTA
+#endif // HASP_USE_ARDUINOOTA
 
 #if HASP_USE_HTTP_UPDATE > 0
 static unsigned long htppLastLoopTime = 0;
diff --git a/src/sys/svc/hasp_ota.h b/src/sys/svc/hasp_ota.h
index fb32bd0c..f338ad6f 100644
--- a/src/sys/svc/hasp_ota.h
+++ b/src/sys/svc/hasp_ota.h
@@ -13,10 +13,10 @@
 
 /* ===== Default Event Processors ===== */
 void otaSetup(void);
-#if HASP_USE_OTA > 0
+#if HASP_USE_ARDUINOOTA > 0
 IRAM_ATTR void otaLoop(void);
 void otaEverySecond(void);
-#endif // HASP_USE_OTA
+#endif // HASP_USE_ARDUINOOTA
 
 /* ===== Special Event Processors ===== */
 #if HASP_USE_HTTP_UPDATE > 0
diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index c0ef07ad..84550b58 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -14,9 +14,6 @@ build_flags =
     ${esp32.ps_ram}
     -D HASP_MODEL="AZ-Touch MOD ESP32 DevKitC"
 
-    ; -D HASP_USE_MDNS=0  ; saves 32 KiB flash
-    ; -D HASP_USE_OTA=0   ; No ArduinoOTA on port 3232
-    
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
     ${touch.xpt2046}
diff --git a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
index 10a24a1b..3baf6677 100644
--- a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
+++ b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
@@ -15,9 +15,6 @@ build_flags =
     ${esp32.ps_ram}
     -D HASP_MODEL="TTGO T7 v1.5"
 
-    ; -D HASP_USE_MDNS=0  ; saves 32 KiB flash
-    ; -D HASP_USE_OTA=0   ; No ArduinoOTA on port 3232
-    
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.ili9341}
     ${touch.xpt2046}
diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini
index 16ef9294..42436b34 100644
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@@ -13,9 +13,6 @@ build_flags =
     ${esp32.build_flags}
     ${esp32.ps_ram}
 
-    ;-D HASP_USE_MDNS=0  ; saves 32 KiB flash
-    ;-D HASP_USE_OTA=0   ; No ArduinoOTA on port 3232
-    
 ;region -- TFT_eSPI build options ------------------------
     -D LGFX_USE_V1=1
     ;-D USER_SETUP_LOADED=1
diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index 7af5c6d8..fd18237b 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -62,7 +62,7 @@ build_flags =
     -D HASP_USE_SPIFFS=0
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=0
-    -D HASP_USE_OTA=0
+    -D HASP_USE_ARDUINOOTA=0
     -D HASP_USE_ETHERNET=0
 ;endregion
 
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
index a6e4e8d4..9b0fd301 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -33,7 +33,7 @@ build_flags =
     -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board
     -D HASP_INPUT_PIN=PD15 ; User Button K1 on DevEBox board
     -D HASP_USE_TASMOTA_CLIENT=1
-    -D HASP_USE_OTA=0
+    -D HASP_USE_ARDUINOOTA=0
     -D HASP_USE_ETHERNET=1
 ;endregion
 
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
index 930292b9..9145b4f4 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
@@ -48,7 +48,7 @@ build_flags =
     -D HASP_INPUT_PIN=PE4 ; User Button K0 on MCUDev Black board
     -D HASP_USE_HTTP=0
     -D HASP_USE_MQTT=1
-    -D HASP_USE_OTA=0
+    -D HASP_USE_ARDUINOOTA=0
 ;endregion
 
 ;region -- Debugging options -----------------------------
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
index a87b5fe9..608a5e66 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
@@ -45,7 +45,7 @@ build_flags =
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=0
     -D HASP_USE_TASMOTA_CLIENT=0
-    -D HASP_USE_OTA=0
+    -D HASP_USE_ARDUINOOTA=0
     -D HASP_USE_ETHERNET=0
 ;endregion
 
diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
index a28ab857..271a3590 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -54,7 +54,7 @@ build_flags =
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=1
     -D HASP_USE_TASMOTA_CLIENT=0
-    -D HASP_USE_OTA=0
+    -D HASP_USE_ARDUINOOTA=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
 ;endregion
diff --git a/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini b/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
index 8350840c..346f7fa9 100644
--- a/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
+++ b/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
@@ -54,7 +54,7 @@ build_flags =
     -D HASP_USE_CONSOLE=1
     -D HASP_USE_GPIO=0
     -D HASP_USE_TASMOTA_CLIENT=0
-    -D HASP_USE_OTA=0
+    -D HASP_USE_ARDUINOOTA=0
     -D HASP_USE_ETHERNET=1
     -D USE_BUILTIN_ETHERNET=1
     -D HASP_ATTRIBUTE_FAST_MEM=