diff --git a/gateway/include/huzzah.h b/gateway/include/huzzah.h
index 33e3b52..60b31ad 100644
--- a/gateway/include/huzzah.h
+++ b/gateway/include/huzzah.h
@@ -11,6 +11,7 @@ Scheduler ts;
 #include "mqtt.h"
 #include "ota.h"
 #include "wifi.h"
+#include "webserver.h"
 
 namespace Board {
 
@@ -46,10 +47,12 @@ namespace Board {
 			[] {
 				Ota::tLoop.enable();
 				Mqtt::tReConnect.enable();
+				WebServer::setup();
 			},
 			[] {
 				Ota::tLoop.disable();
 				Mqtt::tReConnect.disable();
+				WebServer::stop();
 			}
 		);
 		Ota::setup(
@@ -57,6 +60,7 @@ namespace Board {
 				Mqtt::publishCleanupConfig();
 				delay(2000);
 				Mqtt::disconnect();
+	            WebServer::stop();
 			});
 
 		tReadCommand.enable();
diff --git a/gateway/platformio.ini b/gateway/platformio.ini
index 6f8eb3f..9280216 100644
--- a/gateway/platformio.ini
+++ b/gateway/platformio.ini
@@ -33,8 +33,10 @@ framework = arduino
 lib_deps = 
 	${env.lib_deps}
 	arkhipenko/TaskScheduler@^3.8.5
-	https://git.hodos.ro/libraries/ha-mqtt.git@^1.7.0
+	https://git.hodos.ro/libraries/ha-mqtt.git@^1.8.0
+	https://git.hodos.ro/libraries/ha-webserver.git@^0.1.0
 	https://git.hodos.ro/libraries/wifi.git@^2.0.0
+	esphome/ESPAsyncWebServer-esphome@^3.4.0
 upload_port = 192.168.6.161
 upload_protocol = espota
 upload_flags =