diff --git a/hetzner/autoinstall/handlers/main.yml b/hetzner/autoinstall/handlers/main.yml
index d9c0b9e..c131b9b 100644
--- a/hetzner/autoinstall/handlers/main.yml
+++ b/hetzner/autoinstall/handlers/main.yml
@@ -1,2 +1,11 @@
 - name: unlock_disk
-  raw: "printf '{{ autoinstall_disk_encryption_secret }}' | cryptroot-unlock"
+  block:
+  - name: send unlock command
+    raw: "printf '{{ autoinstall_disk_encryption_secret }}' | cryptroot-unlock"
+  - name: wait for boot
+    wait_for:
+      delay: 5
+      port: '{{ ansible_ssh_port|default(22) }}'
+      host: '{{ ansible_ssh_host }}'
+      search_regex: OpenSSH|dropbear
+      timeout: 300