diff --git a/Maintenance/maint-reboot-required.yaml b/Maintenance/maint-reboot-required.yaml
index 6cef18b..a87440d 100644
--- a/Maintenance/maint-reboot-required.yaml
+++ b/Maintenance/maint-reboot-required.yaml
@@ -11,8 +11,7 @@
         path: /var/run/reboot-required
     
     - name: Reboot machine
-      command: /sbin/reboot now
-      poll: 0
+      ansible.builtin.reboot:
       when: reboot.stat.exists
 
     - name: Pause for 15 seconds
@@ -22,6 +21,8 @@
 
     - name: Wait for systems to become reachable
       wait_for_connection:
+        delay: 30
+        timeout: 300
     
     - name: Get list of rebooted servers
       set_fact: