diff --git a/ansible-playbooks/common/reboot-hosts.yml b/ansible-playbooks/common/reboot-hosts.yml
index fad6667..8360220 100644
--- a/ansible-playbooks/common/reboot-hosts.yml
+++ b/ansible-playbooks/common/reboot-hosts.yml
@@ -5,13 +5,8 @@
   become_method: sudo
   
   tasks:
-    - name: Wait for VPN host to be ready after reboot
-      ansible.builtin.wait_for_connection:
-        delay: 5
-        timeout: 300
-        
     - name: Trigger reboot with a slight delay
-      ansible.builtin.shell: "sleep 15 && shutdown -r now"
+      ansible.builtin.shell: "sleep 5 && reboot"
       async: 1
       poll: 0
       ignore_errors: true
diff --git a/ansible-playbooks/update-vpn.yml b/ansible-playbooks/update-vpn.yml
index 1754f13..d1810db 100644
--- a/ansible-playbooks/update-vpn.yml
+++ b/ansible-playbooks/update-vpn.yml
@@ -6,6 +6,11 @@
   become_method: sudo
 
   tasks:
+    - name: Wait for VPN host to be ready after reboot
+      ansible.builtin.wait_for_connection:
+        delay: 5
+        timeout: 300
+
     - name: Update Pi-hole
       ansible.builtin.shell: pihole -up
       args: