diff --git a/ansible-playbooks/common/reboot-hosts.yml b/ansible-playbooks/common/reboot-hosts.yml
index 203db41..1c4d6d5 100644
--- a/ansible-playbooks/common/reboot-hosts.yml
+++ b/ansible-playbooks/common/reboot-hosts.yml
@@ -5,11 +5,11 @@
   become_method: sudo
   
   tasks:
-    - name: Trigger system reboot
-      ansible.builtin.reboot:
-        msg: "Reboot initiated by Semaphore UI"
-        connect_timeout: 5
-        reboot_timeout: 600
-        pre_reboot_delay: 0
-        post_reboot_delay: 30
-        test_command: whoami
+    - name: Trigger reboot with a slight delay
+      ansible.builtin.shell: "sleep 15 && shutdown -r now"
+      async: 1
+      poll: 0
+      ignore_errors: true
+
+    - name: Reboot command issues, exiting play
+      ansible.builtin.meta: end_host