diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml
index 826933a018..5bbd28b132 100644
--- a/ci/environments/scenario007-multinode-containers.yaml
+++ b/ci/environments/scenario007-multinode-containers.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
   OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml
diff --git a/ci/environments/scenario007-standalone.yaml b/ci/environments/scenario007-standalone.yaml
index 18eab0d444..0aa6258c4a 100644
--- a/ci/environments/scenario007-standalone.yaml
+++ b/ci/environments/scenario007-standalone.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase:   ../../deployment/neutron/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase:   ../../deployment/neutron/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
   OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml
diff --git a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
index f1d2bb74fb..279069fb53 100644
--- a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
+++ b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
@@ -44,7 +44,7 @@ parameters:
 resources:
 
   NeutronMl2Base:
-    type: OS::TripleO::Docker::NeutronMl2PluginBase
+    type: OS::TripleO::Services::NeutronMl2PluginBase
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
diff --git a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
index fbe81177c9..233d259cf7 100644
--- a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
+++ b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
@@ -40,7 +40,7 @@ parameters:
 resources:
 
   NeutronBase:
-    type: OS::TripleO::Docker::NeutronMl2PluginBase
+    type: OS::TripleO::Services::NeutronMl2PluginBase
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 03a478110e..2696da2326 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -7,7 +7,7 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the NeutronCorePlugin to use Nuage
-  OS::TripleO::Docker::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
+  OS::TripleO::Services::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
 
 parameter_defaults:
   NeutronNuageNetPartitionName: 'default_name'
diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml
index 5d427ea319..4434cdc41b 100644
--- a/environments/neutron-ovs-dvr.yaml
+++ b/environments/neutron-ovs-dvr.yaml
@@ -5,7 +5,7 @@ resource_registry:
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   # FIXME(bogdando): can not be switched yet due to puppet-base issues
   # see https://review.opendev.org/#/c/563443
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
diff --git a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
index a4121e377b..5f23b2878b 100644
--- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
 # Disabling Neutron services that overlap with OVN
diff --git a/environments/services-baremetal/neutron-ovn-ha.yaml b/environments/services-baremetal/neutron-ovn-ha.yaml
index 9a9ad07557..64be15c368 100644
--- a/environments/services-baremetal/neutron-ovn-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-ha.yaml
@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
@@ -18,6 +18,7 @@ parameter_defaults:
   OVNVifType: ovs
   OVNNeutronSyncMode: log
   OVNQosDriver: ovn-qos
+  NeutronEnableDVR: false
   NeutronTypeDrivers: 'geneve,vlan,flat'
   NeutronNetworkType: 'geneve'
   NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml
index 85f4bec75d..a49f5ca8e9 100644
--- a/environments/services/neutron-ovn-dvr-ha.yaml
+++ b/environments/services/neutron-ovn-dvr-ha.yaml
@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with DVR and HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
diff --git a/environments/services/neutron-ovn-ha.yaml b/environments/services/neutron-ovn-ha.yaml
index 49828deed9..189723d942 100644
--- a/environments/services/neutron-ovn-ha.yaml
+++ b/environments/services/neutron-ovn-ha.yaml
@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non-DVR and HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
diff --git a/environments/services/neutron-ovn-standalone.yaml b/environments/services/neutron-ovn-standalone.yaml
index 4bf71faef1..a5afe8ba18 100644
--- a/environments/services/neutron-ovn-standalone.yaml
+++ b/environments/services/neutron-ovn-standalone.yaml
@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-container-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml
index d52b46800c..4c1f057982 100644
--- a/environments/services/neutron-ovs-dvr.yaml
+++ b/environments/services/neutron-ovs-dvr.yaml
@@ -3,7 +3,7 @@
 # consistent with the default tripleo network templates so some customization
 # is likely required for production deployments.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
diff --git a/environments/services/neutron-ovs.yaml b/environments/services/neutron-ovs.yaml
index a4a76bed3c..c4e182e745 100644
--- a/environments/services/neutron-ovs.yaml
+++ b/environments/services/neutron-ovs.yaml
@@ -1,6 +1,6 @@
 # A Heat environment file that deploys ML2/OVS in the overcloud.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index f670afc4fa..25260f6339 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -18,7 +18,7 @@ resource_registry:
   OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
 
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 8de66d633c..abfe899dbf 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -315,7 +315,7 @@ resource_registry:
   OS::TripleO::Services::DesignateWorker: OS::Heat::None
   OS::TripleO::Services::DesignateMDNS: OS::Heat::None
   OS::TripleO::Services::DesignateSink: OS::Heat::None
-  OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::Multipathd: OS::Heat::None
   OS::TripleO::Services::GlanceApiEdge: OS::Heat::None
   OS::TripleO::Services::HAproxyEdge: OS::Heat::None