diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/timeout.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/timeout.conf
new file mode 100644
index 000000000..e367cf862
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/timeout.conf
@@ -0,0 +1,2 @@
+[Service]
+TimeoutStartSec=90s
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset
index 5767f596e..7d843537e 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset
@@ -1 +1,3 @@
 disable apparmor.service
+
+enable systemd-time-wait-sync.service
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
index d282cfb63..98fe3e1be 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=HassOS supervisor
 Requires=docker.service rauc.service dbus.service
-Wants=network-online.target hassos-apparmor.service
-After=docker.service rauc.service dbus.service network-online.target
+Wants=network-online.target hassos-apparmor.service time-sync.target
+After=docker.service rauc.service dbus.service network-online.target time-sync.target
 RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
 StartLimitIntervalSec=60
 StartLimitBurst=5