diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/network-online.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/network-online.conf
index 765da16cb..bebe04eb4 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/network-online.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/network-online.conf
@@ -2,4 +2,5 @@
 Wants=network-online.target
 
 [Install]
+WantedBy=
 WantedBy=time-sync.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/hassos.conf
index 41093d8ae..809c05838 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/hassos.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/hassos.conf
@@ -1,6 +1,9 @@
 [Unit]
 RequiresMountsFor=/var/lib/systemd
 After=network-online.target
+Before=
+Before=time-set.target shutdown.target
 
 [Install]
+WantedBy=
 WantedBy=time-sync.target