diff --git a/environments/neutron-bgpvpn-bagpipe.yaml b/environments/neutron-bgpvpn-bagpipe.yaml
index 9bf0835eae..9236663c22 100644
--- a/environments/neutron-bgpvpn-bagpipe.yaml
+++ b/environments/neutron-bgpvpn-bagpipe.yaml
@@ -2,22 +2,25 @@
 # backend for BGPVPN service plugin
 #
 # The BaGPipe driver for the BGPVPN service plugin is designed to work jointly
-# with the openvswitch ML2 mechanism driver. It relies on the use of the 
+# with the openvswitch ML2 mechanism driver. It relies on the use of the
 # bagpipe-bgp BGP VPN implementation on compute node and the MPLS implementation
 # in OpenVSwitch.
 #
 resource_registry:
+  OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
   OS::TripleO::Services::NeutronBgpVpnBagpipe: ../puppet/services/neutron-bgpvpn-bagpipe.yaml
 
 parameter_defaults:
 
+  NeutronServicePlugins: 'router,bgpvpn'
+  BgpvpnServiceProvider: 'BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default'
+
   # Required (example)
   # BapipeMyAs: 64512
 
   # Optional (example)
-  # BapipeApiPort: 8082
+  # BapipeApiPort: 8084
   # BapipeDataplaneDriverIpVpn: 'ovs'
   # BapipeEnableRtc: true
   # BapipeOvsBridge: br-mpls
   # BapipePeers: 192.168.10.1,192.168.10.2
-  # BapipeProxyArp: true