diff --git a/include/user_config_override-template.h b/include/user_config_override-template.h
index 40f08565..732fcb13 100644
--- a/include/user_config_override-template.h
+++ b/include/user_config_override-template.h
@@ -41,13 +41,12 @@
 #define MQTT_STATEPERIOD 300000
 
 /***************************************************
- *        Server Settings
+ *        OTA Settings
  **************************************************/
-#define OTA_HOSTNAME ""
-#define OTA_SERVER ""
-#define OTA_PORT 80
+//#define HASP_USE_ARDUINOOTA 1                       // Enable the Arduino OTA service
+#define ARDUINOOTA_PORT 3232
+#define ARDUINOOTA_PASSWORD ""
 #define OTA_URL ""
-#define OTA_PASSWORD ""
 
 /***************************************************
  *        Syslog Settings
@@ -152,4 +151,5 @@
 //#define LV_VDB_SIZE (32 * 1024U)                    // 32KiB of lvgl draw buffer (default 32)
 //#define HASP_DEBUG_OBJ_TREE                         // Output all objects to the log on page changes
 //#define HASP_LOG_LEVEL LOG_LEVEL_VERBOSE            // LOG_LEVEL_* can be DEBUG, VERBOSE, TRACE, INFO, WARNING, ERROR, CRITICAL, ALERT, FATAL, SILENT
-#endif
+
+#endif // HASP_USER_CONFIG_OVERRIDE_H
\ No newline at end of file
diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp
index f52cb692..0715447b 100644
--- a/src/sys/svc/hasp_http.cpp
+++ b/src/sys/svc/hasp_http.cpp
@@ -1981,7 +1981,7 @@ static void webHandleFirmware()
 
             httpMessage += FPSTR(MAIN_MENU_BUTTON);
 
-            webSendHeader(haspDevice.get_hostname(), httpMessage.length(), 50);
+            webSendHeader(haspDevice.get_hostname(), httpMessage.length(), 60);
             webServer.sendContent(httpMessage);
         }
 
diff --git a/src/sys/svc/hasp_ota.cpp b/src/sys/svc/hasp_ota.cpp
index e88ad8c8..88a6b34f 100644
--- a/src/sys/svc/hasp_ota.cpp
+++ b/src/sys/svc/hasp_ota.cpp
@@ -108,8 +108,8 @@ void otaSetup(void)
 #endif
         ArduinoOTA.setRebootOnSuccess(false); // We do that ourselves
 
-#ifdef OTA_PASSWORD
-        ArduinoOTA.setPassword(OTA_PASSWORD); // TODO
+#ifdef ARDUINOOTA_PASSWORD
+        ArduinoOTA.setPassword(ARDUINOOTA_PASSWORD); // TODO
 #endif
 
         ArduinoOTA.begin();