diff --git a/tasks/octavia_amp_image.yml b/tasks/octavia_amp_image.yml
index aeacb29c..591441da 100644
--- a/tasks/octavia_amp_image.yml
+++ b/tasks/octavia_amp_image.yml
@@ -50,6 +50,10 @@
         image: amphora-x64-haproxy
         interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: get_image_facts
+      until: get_image_facts is success
+      retries: 5
+      delay: 10
       when:
          - octavia_download_result | changed
 
@@ -77,5 +81,9 @@
         id: "{{ openstack.id }}"
         interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: remove_old_image
+      until: remove_old_image is success
+      retries: 5
+      delay: 10
       when:
        - openstack is defined # result from os_image_facts
diff --git a/tasks/octavia_security_group.yml b/tasks/octavia_security_group.yml
index 8d855695..f30d0efa 100644
--- a/tasks/octavia_security_group.yml
+++ b/tasks/octavia_security_group.yml
@@ -38,6 +38,10 @@
         description: "security group for octavia amphora"
         interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_security_group
+      until: add_security_group is success
+      retries: 5
+      delay: 10
 
     - name: Create security group rule for agent
       os_security_group_rule:
@@ -56,6 +60,10 @@
         security_group: "{{ octavia_security_group_name }}"
         interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_security_group_rule
+      until: add_security_group_rule is success
+      retries: 5
+      delay: 10
 
     - name: Create security group rule for ssh
       os_security_group_rule:
@@ -74,6 +82,10 @@
         remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
         interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_security_group_rule
+      until: add_security_group_rule is success
+      retries: 5
+      delay: 10
       when:
         - octavia_ssh_enabled | bool
 
@@ -92,5 +104,9 @@
         remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
         interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_security_group_rule
+      until: add_security_group_rule is success
+      retries: 5
+      delay: 10
       when:
         - debug | bool