diff --git a/files/openstack_user_config.yml b/files/openstack_user_config.yml
index 23d7011..2027e6b 100644
--- a/files/openstack_user_config.yml
+++ b/files/openstack_user_config.yml
@@ -50,21 +50,35 @@ global_overrides:
         container_interface: "eth10"
         container_mtu: "9000"
         ip_from_q: "tunnel"
+        net_name: "tunnel"
         type: "geneve"
         range: "1:1000"
         group_binds:
-          - neutron_ovn_controller
-    # - network:
-    #     container_bridge: "br-vlan"
-    #     container_type: "veth"
-    #     container_interface: "eth11"
-    #     container_mtu: "9000"
-    #     type: "vlan"
-    #     range: "700:899"
-    #     net_name: "vlan"
-    #     network_interface: "br-ex"
-    #     group_binds:
-    #       - neutron_ovn_controller
+          - network_hosts
+          - compute_hosts
+    - network:
+        container_bridge: "br-vlan"
+        container_type: "veth"
+        container_interface: "eth11"
+        container_mtu: "9000"
+        type: "vlan"
+        range: "700:899"
+        net_name: "vlan"
+        host_bind_override: "ens2f1"
+        group_binds:
+          - compute_hosts
+
+    - network:
+        container_bridge: "br-vlan"
+        container_type: "veth"
+        container_interface: "eth11"
+        container_mtu: "9000"
+        type: "vlan"
+        range: "700:899"
+        net_name: "vlan"
+        host_bind_override: "ens3"
+        group_binds:
+          - network_hosts
 
 # Workaround for https://github.com/eventlet/eventlet/issues/781
 venv_default_pip_packages:
diff --git a/inventory/devstack.yml b/inventory/devstack.yml
index 74b656f..727f0c7 100644
--- a/inventory/devstack.yml
+++ b/inventory/devstack.yml
@@ -5,6 +5,7 @@ all:
 control:
   hosts:
     ospc.lab.toal.ca:
+      ansible_host: 172.29.236.11
 
 compute:
   hosts:
diff --git a/inventory/host_vars/compute1.lab.toal.ca/networking.yml b/inventory/host_vars/compute1.lab.toal.ca/networking.yml
index b173fae..5b44cf0 100644
--- a/inventory/host_vars/compute1.lab.toal.ca/networking.yml
+++ b/inventory/host_vars/compute1.lab.toal.ca/networking.yml
@@ -3,13 +3,13 @@ network_state:
   dns-resolver:
     config:
       server:
-        - 192.168.90.1
+        - 172.29.236.1
       search: []
   routes:
     config:
       - destination: 0.0.0.0/0
-        next-hop-interface: enp3s0f0
-        next-hop-address: 192.168.90.1
+        next-hop-interface: br-mgmt
+        next-hop-address: 172.29.236.1
         metric: 400
         table-id: 254
   interfaces:
@@ -31,17 +31,6 @@ network_state:
         enabled: false
         dhcp: false
         autoconf: false
-    - name: ens2f1.236
-      type: vlan
-      state: up
-      mtu: 9000
-      ipv4:
-        enabled: false
-        dhcp: false
-      vlan:
-        base-iface: ens2f1
-        id: 236
-        protocol: 802.1q
     - name: ens2f1.240
       type: vlan
       state: up
@@ -69,7 +58,7 @@ network_state:
       state: up
       bridge:
         port:
-          - name: ens2f1.236
+          - name: enp3s0f0
       ipv4:
         enabled: true
         dhcp: false
diff --git a/inventory/host_vars/ospc.lab.toal.ca/networking.yml b/inventory/host_vars/ospc.lab.toal.ca/networking.yml
index 3bcd650..76542f1 100644
--- a/inventory/host_vars/ospc.lab.toal.ca/networking.yml
+++ b/inventory/host_vars/ospc.lab.toal.ca/networking.yml
@@ -3,32 +3,16 @@ network_state:
   dns-resolver:
     config:
       server:
-        - 192.168.90.1
+        - 172.29.236.1
       search: []
   routes:
     config:
       - destination: 0.0.0.0/0
-        next-hop-interface: ens4
-        next-hop-address: 192.168.90.1
+        next-hop-interface: br-mgmt
+        next-hop-address: 172.29.236.1
         metric: 400
         table-id: 254
   interfaces:
-    - name: ens4
-      type: ethernet
-      state: up
-      mtu: 1500
-      ipv4:
-        enabled: true
-        dhcp: false
-        address:
-          - ip: 192.168.90.21
-            prefix-length: 24
-      ipv6:
-        enabled: true
-        dhcp: false
-        autoconf: false
-      # lldp:
-      #   enabled: true
     - name: ens3
       type: ethernet
       state: up
@@ -42,17 +26,6 @@ network_state:
         autoconf: false
       # lldp:
       #   enabled: true
-    - name: ens3.236
-      type: vlan
-      state: up
-      mtu: 9000
-      ipv4:
-        enabled: false
-        dhcp: false
-      vlan:
-        base-iface: ens3
-        id: 236
-        protocol: 802.1q
     - name: ens3.240
       type: vlan
       state: up
@@ -76,7 +49,7 @@ network_state:
       state: up
       bridge:
         port:
-          - name: ens3.236
+          - name: ens4
       ipv4:
         enabled: true
         dhcp: false