diff --git a/environments/deployed-network-environment.j2.yaml b/environments/deployed-network-environment.j2.yaml
index 2de9da29e5..9fb6d2d694 100644
--- a/environments/deployed-network-environment.j2.yaml
+++ b/environments/deployed-network-environment.j2.yaml
@@ -3,7 +3,6 @@
 
 resource_registry:
   OS::TripleO::Network: ../network/deployed_networks.yaml
-  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
 
   # Role ports
   {%- for role in roles %}
diff --git a/environments/deployed-server-deployed-neutron-ports.yaml b/environments/deployed-server-deployed-neutron-ports.yaml
index 129b181249..a50b39cd90 100644
--- a/environments/deployed-server-deployed-neutron-ports.yaml
+++ b/environments/deployed-server-deployed-neutron-ports.yaml
@@ -7,4 +7,3 @@
 # ******************************************************************************
 resource_registry:
   OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
-  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml
index 32b27606ef..4e44221d76 100644
--- a/environments/deployed-server-environment.j2.yaml
+++ b/environments/deployed-server-environment.j2.yaml
@@ -1,7 +1 @@
-resource_registry:
-  OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
-
-parameter_defaults:
-{% for role in roles %}
-  {{role.name}}NetworkConfigTemplate: 'templates/net_config_static_bridge.j2'
-{% endfor %}
+parameter_defaults: {}
diff --git a/environments/deployed-server-noop-ctlplane.yaml b/environments/deployed-server-noop-ctlplane.yaml
index 7ac8ed254b..9aa044511b 100644
--- a/environments/deployed-server-noop-ctlplane.yaml
+++ b/environments/deployed-server-noop-ctlplane.yaml
@@ -1,2 +1 @@
-resource_registry:
-  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
+resource_registry: {}
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 5ca113e262..53bf09d84d 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -33,6 +33,7 @@ resource_registry:
 {%- endfor %}
 
   OS::TripleO::Server: deployed-server/deployed-server.yaml
+  OS::TripleO::DeployedServer::ControlPlanePort: deployed-server/deployed-neutron-port.yaml
 {% for role in roles %}
   OS::TripleO::{{role.name}}Server: OS::TripleO::Server
 {% endfor %}
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index a1f9ce543b..9a0a56ea13 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -213,11 +213,7 @@ parameters:
   {{role.name}}NetworkConfigTemplate:
     description: {{role.name}} NetworkConfig Template
     type: string
-{%- if 'external_bridge' in role.tags|default([]) %}
-    default: 'templates/net_config_bridge.j2'
-{%- else %}
-    default: ''
-{%- endif %}
+    default: 'templates/net_config_static_bridge.j2'
   {{role.name}}ExtraConfig:
     default: {}
     description: |