diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml
index 7d3cdb0..7232285 100644
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
@@ -15,6 +15,7 @@ substitutions:
   ap_password: ${wifi_password}
   device_name: NSPanel
   name: ${device_name}
+  wifi_timeout: '15'
   ##### DON'T CHANGE THIS ######
   version: "4.2.2dev"
   ##############################
@@ -108,7 +109,8 @@ time:
       - seconds: 0
         then:
           - script.execute: refresh_datetime
-      - seconds: 30
+      - minutes: /5
+        seconds: 30
         then:
           - script.execute: watchdog
 
@@ -742,7 +744,7 @@ globals:
   - id: wifi_timeout
     type: uint
     restore_value: false
-    initial_value: '15'
+    initial_value: ${wifi_timeout}
 
   ##### Is uploading TFT #####
   - id: is_uploading_tft
@@ -3093,6 +3095,7 @@ script:
             // report Wi-Fi status
             bool wifi_connected = wifi_component->is_connected();
             if (wifi_connected) {
+              id(wifi_timeout) = ${wifi_timeout};
               float rssi = wifi_rssi->state;
               std::string rssi_status = "Unknown";
               if (rssi > -50) rssi_status = "Excellent";