diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml
index 8d7bc8d97f..93191a7bcd 100644
--- a/environments/overcloud-baremetal.j2.yaml
+++ b/environments/overcloud-baremetal.j2.yaml
@@ -11,10 +11,3 @@ parameter_defaults:
 {% for role in roles %}
   {{role.name}}Services: []
 {% endfor %}
-
-  # Consistent Hostname format
-  ControllerHostnameFormat: overcloud-controller-%index%
-  ComputeHostnameFormat: overcloud-novacompute-%index%
-  ObjectStorageHostnameFormat: overcloud-objectstorage-%index%
-  CephStorageHostnameFormat: overcloud-cephstorage-%index%
-  BlockStorageHostnameFormat: overcloud-blockstorage-%index%
diff --git a/environments/overcloud-services.yaml b/environments/overcloud-services.yaml
index 1d01cb3c47..ac1c69f0e9 100644
--- a/environments/overcloud-services.yaml
+++ b/environments/overcloud-services.yaml
@@ -1,10 +1,2 @@
 resource_registry:
   OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml
-
-parameter_defaults:
-  # Consistent Hostname format
-  ControllerDeployedServerHostnameFormat: overcloud-controller-%index%
-  ComputeDeployedServerHostnameFormat: overcloud-novacompute-%index%
-  ObjectStorageDeployedServerHostnameFormat: overcloud-objectstorage-%index%
-  CephStorageDeployedServerHostnameFormat: overcloud-cephstorage-%index%
-  BlockStorageDeployedServerHostnameFormat: overcloud-blockstorage-%index%
diff --git a/environments/split-stack-consistent-hostname-format.j2.yaml b/environments/split-stack-consistent-hostname-format.j2.yaml
new file mode 100644
index 0000000000..8345c1085c
--- /dev/null
+++ b/environments/split-stack-consistent-hostname-format.j2.yaml
@@ -0,0 +1,5 @@
+parameter_defaults:
+  # Consistent Hostname format
+{% for role in roles %}
+  {{role.name}}HostnameFormat: overcloud-{{role.name.lower()}}-%index%
+{% endfor %}