diff --git a/roles/compute-node/tasks/main.yml b/roles/compute-node/tasks/main.yml
index 7bf99ab..609d9c7 100644
--- a/roles/compute-node/tasks/main.yml
+++ b/roles/compute-node/tasks/main.yml
@@ -71,6 +71,12 @@
 - name: Reboot Required
   become: yes
   command: /sbin/reboot
+  async: 0
+  poll: 0
+  ignore_errors: true
   when: ifaces_changed.stdout != "false"
   tags:
     - interface_config
+
+- name: Wait For Restart
+  local_action: wait_for host={{ ansible_host }} state=started port=22 delay=30 timeout=600