diff --git a/metadata/service/bridge/single.yml b/metadata/service/bridge/single.yml
deleted file mode 100644
index 9475c1f..0000000
--- a/metadata/service/bridge/single.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-applications:
-- neutron
-parameters:
-  neutron:
-    bridge:
-      enabled: true
-      version: icehouse
-      migration: true
-      mtu: 1500
-      bind:
-        address: ${linux:network:host:local:address}
-      metadata:
-        host: ${linux:network:host:vip:address}
-        port: 8775
-        password: metadataPass
-      identity:
-        engine: keystone
-        host: ${linux:network:host:vip:address}
-        port: 35357
-        user: neutron
-        password: ${_secret:keystone_neutron_password}
-        tenant: service
-      message_queue:
-        engine: rabbitmq
-        host: ${linux:network:host:vip:address}
-        port: 5672
-        user: openstack
-        password: ${_secret:rabbitmq_openstack_password}
-        virtual_host: '/openstack'
diff --git a/metadata/service/compute/single.yml b/metadata/service/compute/single.yml
new file mode 100644
index 0000000..d86284d
--- /dev/null
+++ b/metadata/service/compute/single.yml
@@ -0,0 +1,28 @@
+applications:
+- neutron
+parameters:
+  neutron:
+    compute:
+      enabled: true
+      version: ${_param:neutron_version}
+      message_queue:
+        engine: rabbitmq
+        host: ${_param:cluster_vip_address}
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+      local_ip: ${_param:tenant_address}
+      dvr: false
+      external_access: false
+      metadata:
+        host: ${_param:cluster_vip_address}
+        password: ${_param:metadata_password}
+      backend:
+        engine: ml2
+        tenant_network_types: "flat,vxlan"
+        mechanism:
+          ovs:
+            driver: openvswitch
+
+
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index c5ef5c0..2a235c1 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -6,9 +6,7 @@
   neutron:
     server:
       enabled: true
-      fwaas: false
       dns_domain: novalocal
-      tunnel_type: vxlan
       version: ${_param:neutron_version}
       bind:
         address: ${_param:cluster_local_address}
diff --git a/metadata/service/gateway/single.yml b/metadata/service/gateway/single.yml
new file mode 100644
index 0000000..1e8fa2b
--- /dev/null
+++ b/metadata/service/gateway/single.yml
@@ -0,0 +1,26 @@
+applications:
+- neutron
+parameters:
+  neutron:
+    gateway:
+      enabled: true
+      version: ${_param:neutron_version}
+      message_queue:
+        engine: rabbitmq
+        host: ${_param:cluster_vip_address}
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+      local_ip: ${_param:tenant_address}
+      dvr: false
+      external_access: True
+      metadata:
+        host: ${_param:cluster_vip_address}
+        password: ${_param:metadata_password}
+      backend:
+        engine: ml2
+        tenant_network_types: "flat,vxlan"
+        mechanism:
+          ovs:
+            driver: openvswitch
diff --git a/metadata/service/switch/single.yml b/metadata/service/switch/single.yml
deleted file mode 100644
index a398e48..0000000
--- a/metadata/service/switch/single.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-applications:
-- neutron
-parameters:
-  neutron:
-    switch:
-      enabled: true
-      version: icehouse
-      mtu: 1500
-      tunnel_type: gre
-      bind:
-        address: ${linux:network:host:local:address}
-      database:
-        engine: mysql
-        host: ${linux:network:host:vip:address}
-        port: 3306
-        name: neutron
-        user: neutron
-        password: ${_secret:mysql_neutron_password}
-      identity:
-        engine: keystone
-        host: ${linux:network:host:vip:address}
-        port: 35357
-        user: neutron
-        password: ${_secret:keystone_neutron_password}
-        tenant: service
-      message_queue:
-        engine: rabbitmq
-        host: ${linux:network:host:vip:address}
-        port: 5672
-        user: openstack
-        password: ${_secret:rabbitmq_openstack_password}
-        virtual_host: '/openstack'