diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index d0b5ae6fc0..a680423583 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/ansible/roles/cinder/tasks/bootstrap.yml
@@ -71,6 +71,7 @@
 - name: Waiting for bootstrap container to exit
   command: docker wait bootstrap_cinder
   when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
+  run_once: True
 
 - name: Cleaning up Cinder boostrap container
   docker: