diff --git a/docker/services/neutron-bgpvpn-api.yaml b/docker/services/neutron-bgpvpn-api.yaml
new file mode 100644
index 0000000000..67cffad60e
--- /dev/null
+++ b/docker/services/neutron-bgpvpn-api.yaml
@@ -0,0 +1,68 @@
+heat_template_version: queens
+
+description: >
+  BGPVPN API service configured with Puppet
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  DockerNeutronConfigImage:
+    description: The container image to use for the neutron config_volume
+    type: string
+
+resources:
+
+  ContainersCommon:
+    type: ./containers-common.yaml
+
+  NeutronBgpVpnBase:
+    type: ../../puppet/services/neutron-bgpvpn-api.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
+
+outputs:
+  role_data:
+    description: Role data for the BGPVPN role.
+    value:
+      service_name:
+          get_attr: [NeutronBgpVpnBase, role_data, service_name]
+      config_settings:
+          get_attr: [NeutronBgpVpnBase, role_data, config_settings]
+      # BEGIN DOCKER SETTING
+      puppet_config:
+        config_volume: 'neutron'
+        puppet_tags: neutron_bgpvpn_service_config
+        step_config:
+          get_attr: [NeutronBgpVpnBase, role_data, step_config]
+        config_image: {get_param: DockerNeutronConfigImage}
+      kolla_config: {}
+      docker_config: {}
diff --git a/environments/services-docker/neutron-bgpvpn-opendaylight.yaml b/environments/services-docker/neutron-bgpvpn-opendaylight.yaml
new file mode 100644
index 0000000000..220f7850fd
--- /dev/null
+++ b/environments/services-docker/neutron-bgpvpn-opendaylight.yaml
@@ -0,0 +1,12 @@
+# A Heat environment file that can be used to deploy Neutron BGPVPN service
+#
+#  This environment file deploys Neutron BGPVPN service and configures
+#  Opendaylight as its service provider.
+#
+# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
+resource_registry:
+  OS::TripleO::Services::NeutronBgpVpnApi: ../../docker/services/neutron-bgpvpn-api.yaml
+
+parameter_defaults:
+  NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn'
+  BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default'