diff --git a/roles/xos-config-new-tosca/tasks/main.yml b/roles/xos-config-new-tosca/tasks/main.yml
index eba6c3f..b11cef0 100644
--- a/roles/xos-config-new-tosca/tasks/main.yml
+++ b/roles/xos-config-new-tosca/tasks/main.yml
@@ -24,11 +24,13 @@
       xos-password: "{{ head_xos_admin_pass }}"
     body: "{{ lookup('file', head_cord_profile_dir + '/' + item ) }}"
     status_code: 200
+  register: result
+  until: result | success
+  retries: 40
+  delay: 2
   with_items:
     - "fixtures.yaml"
     - "deployment.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
 
 - name: Configure XOS with OpenStack config
   uri:
@@ -39,10 +41,12 @@
       xos-password: "{{ head_xos_admin_pass }}"
     body: "{{ lookup('file', head_cord_profile_dir + '/' + item ) }}"
     status_code: 200
+  register: result
+  until: result | success
+  retries: 40
+  delay: 2
   with_items:
     - openstack.yaml
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
 
 - name: Configure XOS with profile specific TOSCA (new Engine)
   uri:
@@ -53,7 +57,8 @@
       xos-password: "{{ head_xos_admin_pass }}"
     body: "{{ lookup('file', head_cord_profile_dir + '/' + item ) }}"
     status_code: 200
+  register: result
+  until: result | success
+  retries: 40
+  delay: 2
   with_items: "{{ xos_new_tosca_config_templates }}"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-