diff --git a/tripleo_common/templates/group_var_role.j2 b/tripleo_common/templates/group_var_role.j2
index 785ab06e8..0a288700d 100644
--- a/tripleo_common/templates/group_var_role.j2
+++ b/tripleo_common/templates/group_var_role.j2
@@ -1,22 +1,9 @@
-{{ role }}_pre_deployments:
-{% 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/Compute b/tripleo_common/tests/utils/data/Compute
index 7f93c6b38..59fa7b107 100644
--- a/tripleo_common/tests/utils/data/Compute
+++ b/tripleo_common/tests/utils/data/Compute
@@ -1,11 +1,3 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-  - AnsibleDeployment
-
-Compute_post_deployments:  []
-
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment
diff --git a/tripleo_common/tests/utils/data/Controller b/tripleo_common/tests/utils/data/Controller
index 96016966e..ffebeceb8 100644
--- a/tripleo_common/tests/utils/data/Controller
+++ b/tripleo_common/tests/utils/data/Controller
@@ -1,11 +1,3 @@
-Controller_pre_deployments:
-  - ControllerHostEntryDeployment
-  - NetworkDeployment
-  - MyPostConfig
-  - MyExtraConfigPost
-
-Controller_post_deployments:  []
-
 pre_deployments_Controller:
   - ControllerHostEntryDeployment
   - NetworkDeployment