diff --git a/dcos.yml b/dcos.yml
index 91746ab9..d4bbac06 100644
--- a/dcos.yml
+++ b/dcos.yml
@@ -1,11 +1,22 @@
 ---
 - name: Wait for instances to become reachable
   hosts: all
+  gather_facts: no
   tasks:
-    - name: Wait for instances to become reachable
+    - name: Wait for instances to respond to ping
       wait_for_connection:
-        sleep: 10
-        timeout: 120
+
+    - name: Wait for port 22 to be open
+      wait_for:
+        port: 22
+        timeout: 660
+        state: started
+
+- name: Now we gather facts (lol yep)
+  hosts: all
+  tasks:
+    - name: Now lets gather facts
+      setup:
 
 - name: Collect DC/OS versions
   hosts: all