diff --git a/tasks/main.yaml b/tasks/main.yaml
index abac3108ad5e0288307c0b927366f984fabe284b..a040213fc9d043850dff8e0c034bbfd805d257a2 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -87,12 +87,12 @@
   become: true
 
 - name: Pause to let the existing control connection expire
-  pause: seconds=30
+  pause: seconds=45
   when: not rebooting|skipped
 
 - name: Wait for system to boot up
   become: false
-  local_action: shell ansible -u {{ ansible_user_id }} -m ping {{ ansible_ssh_host }}
+  local_action: shell ansible -u {{ ansible_user_id }} -m ping {{ inventory_hostname }}
   register: result
   until: result.rc == 0
   retries: 30