diff --git a/roles/upgrade/tasks/main.yml b/roles/upgrade/tasks/main.yml
index 661224e0f5937479b7c5f5c92d19131e868b6e18..2491bd4b9b9f98d4b9cd7044e0a3585dc9b64adb 100644
--- a/roles/upgrade/tasks/main.yml
+++ b/roles/upgrade/tasks/main.yml
@@ -58,11 +58,11 @@
   async: 2
   poll: 1
   ignore_errors: true
-  sudo: true
+  become: true
+  become_user: root
   when: reboot_now
 
 - name: waiting for server to come back
-  local_action: wait_for host={{ ansible_host }} state=started port=22 delay=30 timeout=600 search_regex=OpenSSH
-  sudo: false
+  wait_for_connection: sleep=60 timeout=600 delay=60
   when: reboot_now