diff --git a/roles/common-prep/handlers/main.yml b/roles/common-prep/handlers/main.yml
index 79f43d9..537ccb3 100644
--- a/roles/common-prep/handlers/main.yml
+++ b/roles/common-prep/handlers/main.yml
@@ -2,18 +2,18 @@
 # file: roles/common-prep/handlers/main.yml
 
 # from https://support.ansible.com/hc/en-us/articles/201958037-Reboot-a-server-and-wait-for-it-to-come-back
-- name: restart machine
+- name: restart host
   shell: sleep 2 && shutdown -r now "Ansible updates triggered"
   async: 1
   poll: 0
   ignore_errors: true
 
-# wait 1m, then try to contact machine for 5m
-- name: wait for machine
+# wait 1m, then try to contact machine for 10m
+- name: wait for host
   become: false
   local_action:
      wait_for host={{ inventory_hostname }}
      port=22
-     delay=60 timeout=300
+     delay=60 timeout=600
      state=started
 
diff --git a/roles/common-prep/tasks/main.yml b/roles/common-prep/tasks/main.yml
index bf1c116..1ea1ad9 100644
--- a/roles/common-prep/tasks/main.yml
+++ b/roles/common-prep/tasks/main.yml
@@ -2,10 +2,18 @@
 # file: roles/common-prep/tasks/main.yml
 
 - name: Upgrade system to current using apt
-  apt: 
+  apt:
     upgrade=dist
-    update_cache=yes 
+    update_cache=yes
     cache_valid_time=3600
+
+- stat:
+    path=/var/run/reboot-required
+  register: reboot-required
+
+- name: reboot if required
+  when: reboot-required.exists is defined
+  debug: msg="System will reboot"
   notify:
     - restart host
     - wait for host