diff --git a/deployment/timesync/chrony-baremetal-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml
index 91e53f21ef..1aa7f71ea1 100644
--- a/deployment/timesync/chrony-baremetal-ansible.yaml
+++ b/deployment/timesync/chrony-baremetal-ansible.yaml
@@ -124,8 +124,10 @@ outputs:
         - name: Install, Configure and Run Chrony
           include_role:
             name: chrony
-        - name: Ensure system is NTP time synced
+        - name: Force NTP sync
           command: chronyc makestep
+        - name: Ensure system is NTP time synced
+          command: chronyc waitsync 30
       ansible_group_vars:
         chrony_role_action: all
         chrony_ntp_servers: {get_param: NtpServer}
diff --git a/firstboot/userdata_timesync.yaml b/firstboot/userdata_timesync.yaml
index 10810324e1..9a20cf61e0 100644
--- a/firstboot/userdata_timesync.yaml
+++ b/firstboot/userdata_timesync.yaml
@@ -75,6 +75,7 @@ resources:
             if [ "$service" = "chrony" ]; then
                 if command -v chronyc >/dev/null; then
                     chronyc makestep
+                    chronyc waitsync 30
                 else
                     echo "No chronyc available, skipping sync"
                 fi