diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index 1129edc..4811500 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -7,7 +7,14 @@
 
 - name: Wait for cloud-init to finish first-boot tasks
   command: cloud-init status --wait
+  register: cloud_init_wait
   changed_when: false
+  failed_when: >-
+    cloud_init_wait.rc not in [0, 2] or
+    (
+      'status: done' not in cloud_init_wait.stdout and
+      'status: disabled' not in cloud_init_wait.stdout
+    )
   when: cloud_init_binary.rc == 0
 
 - name: Update apt cache