diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index bd1a21312e..45f9852031 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -114,8 +114,10 @@
             - container_config_scripts
 
         - name: Write docker config scripts
-          copy: content="{{item.value.content}}" dest="/var/lib/docker-config-scripts/{{item.key}}" force=yes mode="{{item.value.mode|default('0600', true)}}"
-          with_dict: "{{role_data_docker_config_scripts}}"
+          copy: content="{{ item[1].content }}" dest="/var/lib/docker-config-scripts/{{ item[0] }}" force=yes mode="{{ item[1].mode | default('0600', true) }}"
+          loop: "{{ role_data_docker_config_scripts | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           tags:
             - container_config_scripts
 
@@ -162,8 +164,10 @@
             - container_startup_configs
 
         - name: Write per-step docker-container-startup-configs
-          copy: content="{{item.value|to_json}}" dest="/var/lib/tripleo-config/docker-container-startup-config-{{item.key}}.json" force=yes mode=0600
-          with_dict: "{{docker_config_with_default}}"
+          copy: content="{{ item[1] | to_json }}" dest="/var/lib/tripleo-config/docker-container-startup-config-{{ item[0] }}.json" force=yes mode=0600
+          loop: "{{ docker_config_with_default | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           tags:
             - container_startup_configs
 
@@ -190,8 +194,10 @@
             - container_startup_configs
 
         - name: Write kolla config json files
-          copy: content="{{item.value|to_json}}" dest="{{item.key}}" force=yes mode=0600
-          with_dict: "{{role_data_kolla_config}}"
+          copy: content="{{ item[1] | to_json }}" dest="{{ item[0] }}" force=yes mode=0600
+          loop: "{{ role_data_kolla_config | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           tags:
             - container_startup_configs
 
@@ -227,8 +233,10 @@
             - container_config_tasks
 
         - name: Write docker-puppet-tasks json files
-          copy: content="{{item.value|to_json}}" dest=/var/lib/docker-puppet/docker-puppet-tasks{{item.key.replace("step_", "")}}.json force=yes mode=0600
-          with_dict: "{{role_data_docker_puppet_tasks}}"
+          copy: content="{{ item[1] | to_json }}" dest=/var/lib/docker-puppet/docker-puppet-tasks{{ item[0].replace("step_", "") }}.json force=yes mode=0600
+          loop: "{{ role_data_docker_puppet_tasks | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           when: deploy_server_id == bootstrap_server_id
           tags:
             - container_config_tasks