diff --git a/build-flags/build_flags_controllino b/build-flags/build_flags_controllino
index df99d1f..a0605c5 100644
--- a/build-flags/build_flags_controllino
+++ b/build-flags/build_flags_controllino
@@ -3,4 +3,5 @@
 -DWiz5100
 #-DPID_DISABLE
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
diff --git a/build-flags/build_flags_due b/build-flags/build_flags_due
index ba3c848..e8b567f 100644
--- a/build-flags/build_flags_due
+++ b/build-flags/build_flags_due
@@ -10,7 +10,8 @@
 -DARDUINO_OTA_MDNS_DISABLE
 -DMDNS_ENABLE
 -DMCP23017
--DCORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -DTIMER_INT
 
 -DRESTART_LAN_ON_MQTT_ERRORS
diff --git a/build-flags/build_flags_esp32-wifi b/build-flags/build_flags_esp32-wifi
index 4427e78..652d728 100644
--- a/build-flags/build_flags_esp32-wifi
+++ b/build-flags/build_flags_esp32-wifi
@@ -46,5 +46,10 @@
 -DFS_PREPARE
 
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
--DOTA_PORT=80
\ No newline at end of file
+#-D CORS=\"http://lazyhome.ru\"
+-DOTA_PORT=80
+
+-DMQTT_KEEPALIVE=10 
+-DMQTT_SOCKET_TIMEOUT=20
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
\ No newline at end of file
diff --git a/build-flags/build_flags_esp8266-wifi b/build-flags/build_flags_esp8266-wifi
index 80a295b..2210403 100644
--- a/build-flags/build_flags_esp8266-wifi
+++ b/build-flags/build_flags_esp8266-wifi
@@ -17,7 +17,8 @@
 -DFS_PREPARE
 
 -DRESTART_LAN_ON_MQTT_ERRORS
-#-D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -DOTA_PORT=80
 
 #oct22 - violation in Publish/OnMQTTConnect while publish homie info
diff --git a/build-flags/build_flags_lighthub21 b/build-flags/build_flags_lighthub21
index e648695..2ca532e 100644
--- a/build-flags/build_flags_lighthub21
+++ b/build-flags/build_flags_lighthub21
@@ -34,5 +34,7 @@
 #-DdebugSerialPort=Serial
 
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
--DOTA_PORT=80
\ No newline at end of file
+#-D CORS=\"http://lazyhome.ru\"
+-DOTA_PORT=80
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
\ No newline at end of file
diff --git a/build-flags/build_flags_m5stack b/build-flags/build_flags_m5stack
index 8add9ea..2d4f82a 100644
--- a/build-flags/build_flags_m5stack
+++ b/build-flags/build_flags_m5stack
@@ -19,5 +19,6 @@
 
 -DOTA
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -DOTA_PORT=80
\ No newline at end of file
diff --git a/build-flags/build_flags_mega2560-5100 b/build-flags/build_flags_mega2560-5100
index 8d321f5..3418a57 100644
--- a/build-flags/build_flags_mega2560-5100
+++ b/build-flags/build_flags_mega2560-5100
@@ -7,5 +7,6 @@
 -DMDNS_ENABLE
 
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -DOTA_PORT=80
\ No newline at end of file
diff --git a/build-flags/build_flags_mega2560-5500 b/build-flags/build_flags_mega2560-5500
index 8e73151..b445e35 100644
--- a/build-flags/build_flags_mega2560-5500
+++ b/build-flags/build_flags_mega2560-5500
@@ -7,5 +7,6 @@
 -DMDNS_ENABLE
 
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -DOTA_PORT=80
\ No newline at end of file
diff --git a/build-flags/build_flags_mega2560-optiboot b/build-flags/build_flags_mega2560-optiboot
index ce6f2de..b248c5f 100644
--- a/build-flags/build_flags_mega2560-optiboot
+++ b/build-flags/build_flags_mega2560-optiboot
@@ -20,7 +20,8 @@
 -DMDNS_ENABLE
 
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 
 # Example of UARTBRIDGE configuration
 #-DUARTBRIDGE_ENABLE
diff --git a/build-flags/build_flags_mega2560slim-5100 b/build-flags/build_flags_mega2560slim-5100
index 2ae4093..0ee7954 100644
--- a/build-flags/build_flags_mega2560slim-5100
+++ b/build-flags/build_flags_mega2560slim-5100
@@ -19,7 +19,8 @@
 -DARDUINO_OTA_MDNS_DISABLE
 #-DMDNS_ENABLE
 -DRESTART_LAN_ON_MQTT_ERRORS
--D CORS=\"http://lazyhome.ru\"
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -DOTA_PORT=80
 -DHSV_DISABLE
 -DMULTIVENT_DISABLE
diff --git a/build-flags/build_flags_nrf52840 b/build-flags/build_flags_nrf52840
index 3d4ebd2..db80194 100644
--- a/build-flags/build_flags_nrf52840
+++ b/build-flags/build_flags_nrf52840
@@ -14,3 +14,5 @@
 -DPID_DISABLE
 #-DMCP23017
 
+-D CORS=\"*\"
+-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
\ No newline at end of file
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 0ccc4b4..a3bf2fe 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -247,9 +247,9 @@ uint16_t httpHandler(Client& client, String request, uint8_t method, long conten
           
          ArduinoOTA.sendHttpResponse(client,301,false);  // Send only HTTP header, no close socket 
          client.println(
-#ifdef CORS
+#ifdef REDIRECTION_URL
 //Redirect to cloud PWA application               
-             String(F("Location: " CORS "/pwa"))
+             String(F("Location: " REDIRECTION_URL))
 #else
              String(F("Location: /index.html"))
 #endif   
@@ -924,6 +924,7 @@ void ip_ready_config_loaded_connecting_to_broker() {
 
     if (mqttClient.connected())
         {
+          //mqttClient.setKeepAlive(10);  
           lanStatus = RETAINING_COLLECTING;
           return;
         }