diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
index e1ddb2d..9e0290a 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
@@ -2,14 +2,13 @@
 - system.linux.system.repo.mcp10
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
-- system.linux.network.interface.single_ovs_dvr
 - system.heka.alarm.openstack_compute
 - cluster.virtual-mcp10-ovs
 parameters:
   _param:
     primary_interface: ens4
-    tenant_interface: eth2
-    external_interface: eth3
+    tenant_interface: ens5
+    external_interface: ens6
     interface_mtu: 9000
     linux_system_codename: xenial
   nova:
@@ -25,3 +24,41 @@
           - host: ${_param:openstack_control_node01_address}
           - host: ${_param:openstack_control_node02_address}
           - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
index b40d746..79aa1df 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
@@ -1,13 +1,56 @@
 classes:
 - system.linux.system.repo.mcp10
 - system.linux.system.repo.tcp_extra
-- system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp10-ovs
 parameters:
   _param:
     primary_interface: ens4
-    tenant_interface: eth2
-    external_interface: eth3
+    tenant_interface: ens5
+    external_interface: ens6
     interface_mtu: 9000
     linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
\ No newline at end of file