diff --git a/esphome/esp-astroclockstepper1.yaml b/esphome/esp-astroclockstepper1.yaml
index 8a70398..496af1f 100644
--- a/esphome/esp-astroclockstepper1.yaml
+++ b/esphome/esp-astroclockstepper1.yaml
@@ -183,10 +183,12 @@ packages:
 
   #### SNTP (Only use if you want/need accurate timeclocks) ####
   #common_sntp: !include common/sntp_common.yaml
+  common_sntp: !include common/sntp_common_public.yaml
 
   #### DIAGNOSTICS Sensors ####
   diag_basic: !include common/include_basic_diag_sensors.yaml
-  diag_more: !include common/include_more_diag_sensors.yaml
+  diag_more: !include common/include_more_diag_sensors_nomqtt.yaml
+  #diag_more: !include common/include_more_diag_sensors.yaml
   #diag_debug: !include common/include_debug_diag_sensors.yaml
   #diag_resetcount: !include common/include_resetcount_diag_sensors.yaml