diff --git a/nspanel_esphome_advanced.yaml b/nspanel_esphome_advanced.yaml
index 7eb570a..a7b1ebc 100644
--- a/nspanel_esphome_advanced.yaml
+++ b/nspanel_esphome_advanced.yaml
@@ -7,15 +7,6 @@
 ##### ATTENTION: This will add advanced elements to the core system and requires the core part. #####
 #####################################################################################################
 
-captive_portal:
-
-time:
-  - id: !extend time_provider
-    on_time_sync:
-      then:
-        - component.update: api_timestamp
-        - component.update: device_timestamp
-
 api:
   services:
     ##### Service to play a rtttl tones #####
@@ -38,6 +29,8 @@ button:
       - logger.log: "Button pressed: Exit reparse"
       - script.execute: exit_reparse
 
+captive_portal:
+
 sensor:
   ##### Uptime Sensors #####
   - name: ${device_name} Uptime seconds
@@ -91,6 +84,13 @@ text_sensor:
       name: ${device_name} BSSID
       disabled_by_default: true
 
+time:
+  - id: !extend time_provider
+    on_time_sync:
+      then:
+        - component.update: api_timestamp
+        - component.update: device_timestamp
+
 web_server:
   id: web_server_std
   port: 80