diff --git a/framework/files/system/oem/15_timesync.yaml b/framework/files/system/oem/15_timesync.yaml
new file mode 100644
index 000000000..bdd5b54e5
--- /dev/null
+++ b/framework/files/system/oem/15_timesync.yaml
@@ -0,0 +1,9 @@
+name: "Enable systemd-time-wait-sync"
+stages:
+   initramfs:
+     - name: "Default systemd config"
+       if: '[ -e "/sbin/systemctl" ] || [ -e "/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
+       systemctl:
+        enable:
+        - systemd-time-wait-sync
+
diff --git a/framework/files/usr/lib/systemd/system/elemental-register-install.service b/framework/files/usr/lib/systemd/system/elemental-register-install.service
index e145a7993..b44fc696f 100644
--- a/framework/files/usr/lib/systemd/system/elemental-register-install.service
+++ b/framework/files/usr/lib/systemd/system/elemental-register-install.service
@@ -3,6 +3,8 @@ Description=Elemental Register Install
 Documentation=https://elemental.docs.rancher.com
 Wants=network-online.target
 After=network-online.target
+Wants=time-sync.target
+After=time-sync.target
 
 [Service]
 EnvironmentFile=-/etc/default/elemental
diff --git a/framework/files/usr/lib/systemd/system/elemental-register-reset.service b/framework/files/usr/lib/systemd/system/elemental-register-reset.service
index 2f4a1658a..b86f08c35 100644
--- a/framework/files/usr/lib/systemd/system/elemental-register-reset.service
+++ b/framework/files/usr/lib/systemd/system/elemental-register-reset.service
@@ -3,6 +3,8 @@ Description=Elemental Register Reset
 Documentation=https://elemental.docs.rancher.com
 Wants=network-online.target
 After=network-online.target
+Wants=time-sync.target
+After=time-sync.target
 ConditionPathExists=/run/elemental/recovery_mode
 
 [Service]