diff --git a/roles/tripleo_container_image_build/defaults/main.yml b/roles/tripleo_container_image_build/defaults/main.yml
index 922888c..ac10d52 100644
--- a/roles/tripleo_container_image_build/defaults/main.yml
+++ b/roles/tripleo_container_image_build/defaults/main.yml
@@ -26,3 +26,4 @@ tripleo_container_image_build_tag:
 tripleo_container_image_build_timeout: 5700
 tripleo_container_image_build_volumes: []
 tripleo_container_image_build_work_dir:
+tripleo_container_image_build_retries: 0
diff --git a/roles/tripleo_container_image_build/tasks/main.yml b/roles/tripleo_container_image_build/tasks/main.yml
index 8767ddb..2c2c995 100644
--- a/roles/tripleo_container_image_build/tasks/main.yml
+++ b/roles/tripleo_container_image_build/tasks/main.yml
@@ -62,6 +62,8 @@
   when:
     - not ansible_check_mode|bool
     - not tripleo_container_image_build_generate_scripts_only|bool
+  until: tripleo_container_image_build_result is success
+  retries: "{{ tripleo_container_image_build_retries }}"
 
 - name: Set output fact
   set_fact: