diff --git a/common/deploy-steps-tasks-step-1.yaml b/common/deploy-steps-tasks-step-1.yaml
index 62c5e06f3f..77e2464494 100644
--- a/common/deploy-steps-tasks-step-1.yaml
+++ b/common/deploy-steps-tasks-step-1.yaml
@@ -270,18 +270,10 @@
     setype: container_file_t
     selevel: s0
 
-- name: Write kolla config json files
+- name: Write container config json files
   become: true
-  no_log: True
-  copy:
-    content: "{{ item[1] | to_nice_json }}"
-    dest: "{{ item[0] }}"
-    force: yes
-    mode: '0600'
-    setype: container_file_t
-  loop: "{{ lookup('file', tripleo_role_name + '/kolla_config.yaml', errors='ignore') | default([], True) | from_yaml | dictsort }}"
-  loop_control:
-    label: "{{ item[0] }}"
+  tripleo_container_configs:
+    config_data: "{{ lookup('file', tripleo_role_name + '/kolla_config.yaml', errors='ignore') | default({}, True) | from_yaml }}"
   tags:
     - container_startup_configs