diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 2d0b1a4002..3132bf5914 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -224,8 +224,8 @@
 
 - name: Calculate container_puppet_tasks for {{ansible_hostname | lower}} step {{step}}
   set_fact:
-    host_container_puppet_tasks: "{{host_container_puppet_tasks|default([]) + [item]}}"
-  loop: "{{container_puppet_tasks.get('step_' + step, [])}}"
+    "{{'host_container_puppet_tasks_' ~ step}}": "{{lookup('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | union([item])}}"
+  loop: "{{container_puppet_tasks.get('step_' ~ step, [])}}"
   when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first | lower) == ansible_hostname | lower
   vars:
     container_puppet_tasks: "{{ lookup('file', tripleo_role_name + '/container_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml }}"
@@ -234,6 +234,6 @@
 
 - name: Include container-puppet tasks for step {{step}}
   include_tasks: host-container-puppet-tasks.yaml
-  when: host_container_puppet_tasks is defined
+  when: ('host_container_puppet_tasks_' ~ step)  is defined
   tags:
     - container_config_tasks
diff --git a/common/host-container-puppet-tasks.yaml b/common/host-container-puppet-tasks.yaml
index 969d44feb7..3ba7b1c9d1 100644
--- a/common/host-container-puppet-tasks.yaml
+++ b/common/host-container-puppet-tasks.yaml
@@ -1,7 +1,7 @@
 - name: Write container-puppet-tasks json file for {{ansible_hostname | lower}} step {{step}}
   no_log: True
   copy:
-    content: "{{host_container_puppet_tasks|to_nice_json}}"
+    content: "{{lookup ('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | to_nice_json}}"
     dest: "/var/lib/container-puppet/container-puppet-tasks{{step}}.json"
     force: yes
     mode: '0600'