diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index eb6e00c5a8..cfb3c3691b 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -579,7 +579,7 @@
       set_fact:
         host_container_puppet_tasks: "{{host_container_puppet_tasks|default([]) + [item]}}"
       loop: "{{container_puppet_tasks.get('step_' + step, [])}}"
-      when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | first) == ansible_hostname
+      when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first) == ansible_hostname
       vars:
         container_puppet_tasks: "{{ lookup('file', tripleo_role_name + '/container_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml }}"
       tags:
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 6a4ddcf857..1b07e4e78f 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -366,6 +366,7 @@ outputs:
         enable_internal_tls: {get_param: EnableInternalTLS}
         cloud_domain: {get_param: CloudDomain}
         all_nodes_extra_map_data: {get_param: AllNodesExtraMapData}
+        sorted_bootstrap_node: true
       common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
       docker_puppet_script: {get_file: ./container-puppet.py}
       all_nodes_validation_script.sh : {get_file: ../validation-scripts/all-nodes.sh}