diff --git a/playbooks/host_reboot.yml b/playbooks/host_reboot.yml
index 06c32ea1b8..c51a81a899 100644
--- a/playbooks/host_reboot.yml
+++ b/playbooks/host_reboot.yml
@@ -14,13 +14,7 @@
     ignore_errors: true
 
   - name: Reboot the host
-    ansible.builtin.command: /sbin/shutdown -r 1
-
-  - name: Wait for host to come back - up to 15 minutes
-    local_action: wait_for host={{ target }} port=22 delay=120 timeout=900 search_regex=OpenSSH
-
-#  - name: Sync time
-#    ansible.builtin.command: ntpdate -u 1.rhel.pool.ntp.org
+    reboot: reboot_timeout=1800
 
   - name: Tell nagios to unshush
     nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}