diff --git a/reboot_measurement/reboot_measure.yml b/reboot_measurement/reboot_measure.yml
index 6763e15..a7964d6 100755
--- a/reboot_measurement/reboot_measure.yml
+++ b/reboot_measurement/reboot_measure.yml
@@ -107,7 +107,15 @@
 
   - name: Simply reboot the system
     reboot:
-      reboot_timeout: 1800
+      reboot_timeout: 240
+
+  - name: wait for ssh to come up
+    local_action: wait_for
+      host="{{ dyn_data.test_hostname }}"
+      port=22
+      state=started
+      delay=1
+      timeout=1200
 
   - name: grab reboot end time
     command: "date -u +%s"