diff --git a/site.yml b/site.yml
index 30bb760..956144d 100644
--- a/site.yml
+++ b/site.yml
@@ -1,6 +1,7 @@
 ---
 # file: site.yml
 - include: generate_infra_dynamic_groups.yml
+- include: wait_for_servers.yml
 - include: common.yml
 - include: set_hostnames.yml
 - include: bootstrap_puppetmaster.yml
diff --git a/wait_for_servers.yml b/wait_for_servers.yml
new file mode 100644
index 0000000..dc50857
--- /dev/null
+++ b/wait_for_servers.yml
@@ -0,0 +1,10 @@
+---
+# file: wait_for_servers.yml
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  user: ubuntu
+  become: true
+  tasks:
+    - wait_for: port=22 host="{{ hostvars[item]['ansible_ssh_host'] }}" search_regex=OpenSSH delay=10
+      with_items: "{{ groups['infra'] }}"