diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 7a4889b..4ab6709 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -120,6 +120,10 @@
         engine: file
       images: []
       workers: 1
+  neutron:
+    server:
+      l2gw:
+        enabled: true
   nova:
     controller:
       networking: dvr
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
index 4cb8093..ae64c8f 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -11,6 +11,12 @@
     external_interface: ens6
     interface_mtu: 9000
     linux_system_codename: xenial
+  neutron:
+    gateway:
+      l2gw:
+        enabled: false
+        ovsdb_hosts:
+          ovsdbx: 127.0.0.1:6632
   linux:
     network:
       bridge: openvswitch