diff --git a/environments/neutron-bgpvpn-bagpipe.yaml b/environments/neutron-bgpvpn-bagpipe.yaml
index c085e69b23..99f4fad009 100644
--- a/environments/neutron-bgpvpn-bagpipe.yaml
+++ b/environments/neutron-bgpvpn-bagpipe.yaml
@@ -12,7 +12,7 @@ resource_registry:
 
 parameter_defaults:
 
-  NeutronServicePlugins: 'router,bgpvpn'
+  NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log,bgpvpn'
   BgpvpnServiceProvider: 'BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default'
 
   # Required (example)
diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml
index a1ee2957f0..48baea7f12 100644
--- a/environments/neutron-bgpvpn.yaml
+++ b/environments/neutron-bgpvpn.yaml
@@ -12,5 +12,5 @@ resource_registry:
   OS::TripleO::Services::NeutronBgpVpnApi: ../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
 
 parameter_defaults:
-  NeutronServicePlugins: 'router,bgpvpn'
+  NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log,bgpvpn'
   BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'