diff --git a/tripleo_common/templates/host_var_server.j2 b/tripleo_common/templates/host_var_server.j2
index 6165023c7..8dd0126d9 100644
--- a/tripleo_common/templates/host_var_server.j2
+++ b/tripleo_common/templates/host_var_server.j2
@@ -1,23 +1,9 @@
-{{ role }}_pre_deployments: {% if not pre_deployments %} [] {% endif %}
-
-{% for deployment in pre_deployments %}
-  - {{ 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 %}
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 88a1e8d8e..cd0dbe796 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
@@ -1,17 +1,9 @@
-Controller_pre_deployments:
-  - ControllerHostEntryDeployment
-  - NetworkDeployment
-  - MyPostConfig
-  - MyExtraConfigPost
-
 pre_deployments_Controller:
   - ControllerHostEntryDeployment
   - NetworkDeployment
   - MyPostConfig
   - MyExtraConfigPost
 
-Controller_post_deployments:  []
-
 post_deployments_Controller:  []
 
 uuid: 0
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 2cc18d4a1..27d1d0bec 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
@@ -1,15 +1,8 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - 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 f6faf4b9a..2f7d0bd65 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
@@ -1,15 +1,8 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - 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 1cffc3ac0..755bde995 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
@@ -1,17 +1,9 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-  - AnsibleDeployment
-
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment
   - MyExtraConfigPost
   - AnsibleDeployment
 
-Compute_post_deployments:  []
-
 post_deployments_Compute:  []
 
 uuid: 3