diff --git a/elements/neutron-server/install.d/80-neutron-server b/elements/neutron-server/install.d/80-neutron-server
index c19d52b10..e311d1f92 100755
--- a/elements/neutron-server/install.d/80-neutron-server
+++ b/elements/neutron-server/install.d/80-neutron-server
@@ -1,3 +1,3 @@
 #!/bin/bash
 os-svc-daemon neutron-server neutron neutron-server \
-    "--config-file /etc/neutron/neutron.conf  --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron"
+    "--config-file /etc/neutron/neutron.conf  --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron"
diff --git a/elements/neutron/os-config-applier/etc/neutron/neutron.conf b/elements/neutron/os-config-applier/etc/neutron/neutron.conf
index ec5970611..7881b2732 100644
--- a/elements/neutron/os-config-applier/etc/neutron/neutron.conf
+++ b/elements/neutron/os-config-applier/etc/neutron/neutron.conf
@@ -9,7 +9,8 @@ auth_strategy = keystone
 allow_overlapping_ips = False
 debug = False
 verbose = True
-core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
+core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
+service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin
 
 {{#rabbit}}
 rabbit_host = {{host}}
diff --git a/elements/neutron/os-config-applier/etc/neutron/plugins/ml2/ml2_conf.ini b/elements/neutron/os-config-applier/etc/neutron/plugins/ml2/ml2_conf.ini
new file mode 100644
index 000000000..6f71d6dd8
--- /dev/null
+++ b/elements/neutron/os-config-applier/etc/neutron/plugins/ml2/ml2_conf.ini
@@ -0,0 +1,25 @@
+[ml2]
+type_drivers = local,flat,vlan,gre,vxlan
+mechanism_drivers = openvswitch
+
+[ml2_type_flat]
+
+[ml2_type_vlan]
+
+[ml2_type_gre]
+tunnel_id_ranges = 1:1000
+
+[ml2_type_vxlan]
+vni_ranges = 1001:2000
+
+[database]
+connection = {{neutron.ovs_db}}
+
+[ovs]
+local_ip = {{neutron.ovs.local_ip}}
+
+[agent]
+root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+
+[securitygroup]
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver