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
new file mode 100644
index 000000000..765da16cb
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/network-online.conf
@@ -0,0 +1,5 @@
+[Unit]
+Wants=network-online.target
+
+[Install]
+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 deca0bec3..41093d8ae 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,2 +1,6 @@
 [Unit]
 RequiresMountsFor=/var/lib/systemd
+After=network-online.target
+
+[Install]
+WantedBy=time-sync.target