diff --git a/roles/common-prep/handlers/main.yml b/roles/common-prep/handlers/main.yml
new file mode 100644
index 0000000..79f43d9
--- /dev/null
+++ b/roles/common-prep/handlers/main.yml
@@ -0,0 +1,19 @@
+---
+# 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
+  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
+  become: false
+  local_action:
+     wait_for host={{ inventory_hostname }}
+     port=22
+     delay=60 timeout=300
+     state=started
+
diff --git a/roles/common-prep/tasks/main.yml b/roles/common-prep/tasks/main.yml
index 0e5474d..a7ffc3b 100644
--- a/roles/common-prep/tasks/main.yml
+++ b/roles/common-prep/tasks/main.yml
@@ -3,6 +3,9 @@
 
 - name: Upgrade system to current using apt
   apt: update_cache=yes upgrade=dist
+  notify:
+    - restart machine
+    - wait for machine
 
 - name: Install standard packages
   apt:  pkg={{ item }} state=present
@@ -14,3 +17,4 @@
   lineinfile: dest=/etc/vim/vimrc
     regexp="^\s*syntax on"
     line="syntax on"
+