diff --git a/ansible.cfg b/ansible.cfg
index 13ba836..09042b9 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,3 +1,3 @@
 [defaults]
-timeout = 120
+timeout = 300
 pipelining = True
diff --git a/playbooks/rebuild.yml b/playbooks/rebuild.yml
index 6c7eecf..34460ce 100644
--- a/playbooks/rebuild.yml
+++ b/playbooks/rebuild.yml
@@ -18,6 +18,8 @@
     instance_id: "{{ instance_id }}"
     image_id: "{{ rebuild_image_id }}"
     preserve_ephemeral: true
+    wait: "yes"
+    wait_for: 900
   delegate_to: localhost
   when: instance_image_id != rebuild_image_id and force_rebuild is not defined
 - name: "Call nova_rebuild if rebuild is mandated"
@@ -25,5 +27,7 @@
     instance_id: "{{ instance_id }}"
     image_id: "{{ rebuild_image_id }}"
     preserve_ephemeral: true
+    wait: "yes"
+    wait_for: 900
   delegate_to: localhost
   when: force_rebuild is defined