diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py
index a48e15bcd..1e61a80d9 100644
--- a/packstack/plugins/neutron_350.py
+++ b/packstack/plugins/neutron_350.py
@@ -613,8 +613,13 @@ def create_manifests(config, messages):
     global q_hosts
 
     service_plugins = []
+    service_providers = []
     if config['CONFIG_LBAAS_INSTALL'] == 'y':
+        lbaas_sp = ('LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.'
+                    'drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'
+                    ':default')
         service_plugins.append('lbaas')
+        service_providers.append(lbaas_sp)
 
     # ML2 uses the L3 Router service plugin to implement l3 agent
     service_plugins.append('router')
@@ -627,10 +632,16 @@ def create_manifests(config, messages):
 
     if config['CONFIG_NEUTRON_VPNAAS'] == 'y':
         service_plugins.append('vpnaas')
+        vpnaas_sp = ('VPN:libreswan:neutron_vpnaas.services.vpn.'
+                     'service_drivers.ipsec.IPsecVPNDriver:default')
+        service_providers.append(vpnaas_sp)
 
     config['SERVICE_PLUGINS'] = (service_plugins if service_plugins
                                  else 'undef')
 
+    config['SERVICE_PROVIDERS'] = (service_providers if service_providers
+                                   else [])
+
     config['FIREWALL_DRIVER'] = ("neutron.agent.linux.iptables_firewall."
                                  "OVSHybridIptablesFirewallDriver")
 
diff --git a/packstack/puppet/templates/neutron_api.pp b/packstack/puppet/templates/neutron_api.pp
index 6f3e6027d..2ac8f19cd 100644
--- a/packstack/puppet/templates/neutron_api.pp
+++ b/packstack/puppet/templates/neutron_api.pp
@@ -7,7 +7,8 @@ class { '::neutron::server':
   sync_db             => true,
   enabled             => true,
   api_workers         => $service_workers,
-  rpc_workers         => $service_workers
+  rpc_workers         => $service_workers,
+  service_providers   => hiera_array('SERVICE_PROVIDERS')
 }
 
 # TODO: FIXME: remove this hack after upstream resolves https://bugs.launchpad.net/puppet-neutron/+bug/1474961