diff --git a/deployment/timesync/chrony-baremetal-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml
index b0bb66847f..2124da77a3 100644
--- a/deployment/timesync/chrony-baremetal-ansible.yaml
+++ b/deployment/timesync/chrony-baremetal-ansible.yaml
@@ -122,7 +122,7 @@ outputs:
         - name: Ensure chrony has been restarted
           meta: flush_handlers
         - name: Ensure system is NTP time synced
-          command: chronyc waitsync 20
+          command: chronyc makestep
       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 1802b436e2..10810324e1 100644
--- a/firstboot/userdata_timesync.yaml
+++ b/firstboot/userdata_timesync.yaml
@@ -74,7 +74,7 @@ resources:
             set -x
             if [ "$service" = "chrony" ]; then
                 if command -v chronyc >/dev/null; then
-                    chronyc waitsync 20
+                    chronyc makestep
                 else
                     echo "No chronyc available, skipping sync"
                 fi