diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml
deleted file mode 100644
index b768c47b97..0000000000
--- a/deployed-server/deployed-server-environment-output.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-heat_template_version: wallaby
-
-parameters:
-  RoleCounts:
-    type: json
-    default: {}
-  VipMap:
-    type: json
-    default: {}
-  DeployedServerPortMap:
-    type: json
-    default: {}
-  DefaultRouteIp:
-    type: string
-    default: 192.168.24.1
-
-resources:
-
-  DeployedServerPortMapParameter:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-        DeployedServerPortMap:
-          map_merge:
-            - {get_param: DeployedServerPortMap}
-            - control_virtual_ip:
-                fixed_ips:
-                  - ip_address: {get_param: [VipMap, ctlplane]}
-            - redis_virtual_ip:
-                fixed_ips:
-                  - ip_address: {get_param: [VipMap, redis]}
-            - ovn_dbs_virtual_ip:
-                fixed_ips:
-                  - ip_address: {get_param: [VipMap, ovn_dbs]}
-
-  DeployedServerEnvironment:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-        parameter_defaults:
-          map_merge:
-            - {get_attr: [DeployedServerPortMapParameter, value]}
-            - ControlPlaneDefaultRoute: {get_param: DefaultRouteIp}
-            - {get_param: RoleCounts}
-
-outputs:
-  deployed_server_environment:
-    description:
-      Environment data that can be used as input into the services stack when
-      using split-stack.
-    value: {get_attr: [DeployedServerEnvironment, value]}
diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml
index 4f0bcb26d5..025e8bebad 100644
--- a/environments/overcloud-baremetal.j2.yaml
+++ b/environments/overcloud-baremetal.j2.yaml
@@ -2,7 +2,6 @@ resource_registry:
   OS::TripleO::AllNodes::SoftwareConfig: OS::Heat::None
   OS::TripleO::PostDeploySteps: OS::Heat::None
   OS::TripleO::AllNodesDeployment: OS::Heat::None
-  OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml
 
 parameter_defaults:
   # Deploy no services
diff --git a/environments/overcloud-services.yaml b/environments/overcloud-services.yaml
deleted file mode 100644
index ac1c69f0e9..0000000000
--- a/environments/overcloud-services.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resource_registry:
-  OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml