diff --git a/roles/hcloud/tasks/main.yml b/roles/hcloud/tasks/main.yml
index 1e733eb..61a6eaa 100644
--- a/roles/hcloud/tasks/main.yml
+++ b/roles/hcloud/tasks/main.yml
@@ -89,3 +89,12 @@
     record_name: "{{ inventory_hostname }}"
   tags:
     - update_dns
+
+- name: "Wait for {{ inventory_hostname }}"
+  delegate_to: localhost
+  wait_for:
+    timeout: 120
+    port: 22
+    host: '{{ stage_server_ip }}'
+    delay: 10
+    search_regex: OpenSSH