diff --git a/tripleo_common/templates/host_var_server.j2 b/tripleo_common/templates/host_var_server.j2
index 2a6263bd5..6165023c7 100644
--- a/tripleo_common/templates/host_var_server.j2
+++ b/tripleo_common/templates/host_var_server.j2
@@ -4,12 +4,26 @@
   - {{ deployment }}
 {% endfor %}
 
+# Temporary duplication
+# https://bugs.launchpad.net/tripleo/+bug/1842141
+pre_deployments_{{ role }}: {% if not pre_deployments %} [] {% endif %}
+
+{% for deployment in pre_deployments %}
+  - {{ deployment }}
+{% endfor %}
+
 {{ role }}_post_deployments: {% if not post_deployments %} [] {% endif %}
 
 {% for deployment in post_deployments %}
   - {{ deployment }}
 {% endfor %}
 
+post_deployments_{{ role }}: {% if not post_deployments %} [] {% endif %}
+
+{% for deployment in post_deployments %}
+  - {{ deployment }}
+{% endfor %}
+
 {% if ansible_host_vars %}
 # ansible_host_vars managed by TripleO Heat Templates in puppet/role.role.j2.yaml:
 {{ ansible_host_vars }}
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0 b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
index d9b70e7b0..88a1e8d8e 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
@@ -4,7 +4,15 @@ Controller_pre_deployments:
   - MyPostConfig
   - MyExtraConfigPost
 
+pre_deployments_Controller:
+  - ControllerHostEntryDeployment
+  - NetworkDeployment
+  - MyPostConfig
+  - MyExtraConfigPost
+
 Controller_post_deployments:  []
 
+post_deployments_Controller:  []
+
 uuid: 0
 my_var: 'foo'
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0 b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
index cc5dcf87d..2cc18d4a1 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
@@ -3,6 +3,13 @@ Compute_pre_deployments:
   - NetworkDeployment
   - MyExtraConfigPost
 
+pre_deployments_Compute:
+  - ComputeHostEntryDeployment
+  - NetworkDeployment
+  - MyExtraConfigPost
+
 Compute_post_deployments:  []
 
+post_deployments_Compute:  []
+
 uuid: 1
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1 b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
index 765fc84c7..f6faf4b9a 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
@@ -3,6 +3,13 @@ Compute_pre_deployments:
   - NetworkDeployment
   - MyExtraConfigPost
 
+pre_deployments_Compute:
+  - ComputeHostEntryDeployment
+  - NetworkDeployment
+  - MyExtraConfigPost
+
 Compute_post_deployments:  []
 
+post_deployments_Compute:  []
+
 uuid: 2
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2 b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
index 644fded13..1cffc3ac0 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
@@ -4,6 +4,14 @@ Compute_pre_deployments:
   - MyExtraConfigPost
   - AnsibleDeployment
 
+pre_deployments_Compute:
+  - ComputeHostEntryDeployment
+  - NetworkDeployment
+  - MyExtraConfigPost
+  - AnsibleDeployment
+
 Compute_post_deployments:  []
 
+post_deployments_Compute:  []
+
 uuid: 3