diff --git a/platformio.ini b/platformio.ini
index d2ee75f..a79037e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,3 +19,6 @@ lib_deps =
 	sandeepmistry/LoRa@^0.8.0
 	adafruit/Adafruit GFX Library @ 1.11.5
 	adafruit/Adafruit SSD1306 @ 2.5.7
+	ayushsharma82/AsyncElegantOTA@^2.2.7
+	ottowinter/ESPAsyncWebServer-esphome@^3.0.0
+	esphome/AsyncTCP-esphome@^2.0.0
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 903b7d9..bdf6b84 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -9,9 +9,14 @@
 #include "lora_utils.h"
 #include "utils.h"
 
+#include <AsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+#include <AsyncElegantOTA.h>
+
 #define VERSION   "2023.06.04"
 
 WiFiClient      espClient;
+AsyncWebServer  server(80);
 String          ConfigurationFilePath = "/igate_conf.json";
 Configuration   Config(ConfigurationFilePath);
 
@@ -39,10 +44,13 @@ void setup_wifi() {
   delay(100);
   unsigned long start = millis();
 
-  if (!Config.network.DHCP) {
+  /*if (Config.network.DHCP) {
     WiFi.setHostname(Config.callsign.c_str());
-    WiFi.config(Config.network.ip, Config.network.gateway, Config.network.subnet, Config.network.dns1, Config.network.dns2);
-  }
+    if (!WiFi.config(Config.network.ip, Config.network.gateway, Config.network.subnet, Config.network.dns1, Config.network.dns2)) {
+      Serial.println("STA Failed to configure");
+    }
+    //WiFi.config(Config.network.ip, Config.network.gateway, Config.network.subnet, Config.network.dns1, Config.network.dns2);
+  }*/
 
   WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
   while (WiFi.status() != WL_CONNECTED) {
@@ -335,6 +343,15 @@ void setup() {
   show_display("   LoRa APRS iGate", "    Richonguzman", "    -- CD2RXU --", "     " VERSION, 4000); 
   setup_wifi();
   btStop();
+
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hi! I am ESP32.");
+  });
+
+  AsyncElegantOTA.begin(&server);    // Start ElegantOTA
+  server.begin();
+  Serial.println("HTTP server started");
+
   LoRaUtils::setup();
   iGateLatitude = create_lat_aprs(currentWiFi->latitude);
   iGateLongitude = create_lng_aprs(currentWiFi->longitude);