diff --git a/environments/deployed-network-environment.j2.yaml b/environments/deployed-network-environment.j2.yaml
index 9fb6d2d694..de29dece07 100644
--- a/environments/deployed-network-environment.j2.yaml
+++ b/environments/deployed-network-environment.j2.yaml
@@ -12,7 +12,6 @@ resource_registry:
   {%- endfor %}
 
   # VIP ports
-  OS::TripleO::Network::Ports::ControlPlaneVipPort: ../network/ports/deployed_vip_ctlplane.yaml
   {%- for network in networks if network.enabled|default(true) and network.vip %}
   OS::TripleO::Network::Ports::{{ network.name }}VipPort: ../network/ports/deployed_vip_{{ network.name_lower }}.yaml
   {%- endfor %}
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 3d1d9ada4c..be43c722e9 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -75,7 +75,7 @@ resource_registry:
   OS::TripleO::Network::Ports::{{network.name}}VipPort: network/ports/noop.yaml
   {%- endfor %}
 
-  OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Neutron::Port
+  OS::TripleO::Network::Ports::ControlPlaneVipPort: network/ports/deployed_vip_ctlplane.yaml
 
   # Service to network Mappings
   OS::TripleO::ServiceNetMap: network/service_net_map.yaml