diff --git a/devstack_setup.yml b/devstack_setup.yml
index 954e090..df39bf3 100644
--- a/devstack_setup.yml
+++ b/devstack_setup.yml
@@ -4,11 +4,11 @@
   become: true
 
   tasks:
-    - name: Add RDO Antelope repo to dnf
-      ansible.builtin.dnf:
-        name: 'https://www.rdoproject.org/repos/rdo-release.el9.rpm'
-        state: present
-        disable_gpg_check: true
+#    - name: Add RDO Antelope repo to dnf
+#      ansible.builtin.dnf:
+#        name: 'https://www.rdoproject.org/repos/rdo-release.el9.rpm'
+#        state: present
+#        disable_gpg_check: true
 
     - name: Update all packages
       ansible.builtin.package:
@@ -46,11 +46,11 @@
         user: stack
         state: present
 
-    - name: OpenVSwitch Service enabled and started
-      ansible.builtin.service:
-        name: openvswitch
-        state: started
-        enabled: true
+    # - name: OpenVSwitch Service enabled and started
+    #   ansible.builtin.service:
+    #     name: openvswitch
+    #     state: started
+    #     enabled: true
 
 - name: Bootstrap Network configuration
   hosts: all
@@ -103,6 +103,14 @@
     #     group: root
     #     mode: '0600'
 
+    - name: Add /usr/local/bin to bashrc PATH
+      ansible.builtin.lineinfile:
+        path: /etc/bashrc
+        line: PATH="${PATH}:/usr/local/sbin:/usr/local/bin"
+        state: present
+        insertafter: EOF
+        create: true
+
     - name: Clone openstack-ansible repo into /opt/openstack-ansible
       ansible.builtin.git:
         repo: https://opendev.org/openstack/openstack-ansible
diff --git a/files/openstack_user_config.yml b/files/openstack_user_config.yml
index 2027e6b..f6e97a9 100644
--- a/files/openstack_user_config.yml
+++ b/files/openstack_user_config.yml
@@ -12,7 +12,7 @@ global_overrides:
   internal_lb_vip_address: 172.29.236.11
   external_lb_vip_address: 172.29.236.10
   management_bridge: "br-mgmt"
-  tunnel_bridge: "br-vxlan"
+  tunnel_bridge: "br-tunnel"
   neutron_provider_networks:
     network_types: "geneve"
     network_geneve_ranges: "1:1000"
@@ -81,8 +81,8 @@ global_overrides:
           - network_hosts
 
 # Workaround for https://github.com/eventlet/eventlet/issues/781
-venv_default_pip_packages:
-  - eventlet==0.33.3
+# venv_default_pip_packages:
+#   - eventlet==0.33.3
 
 neutron_plugin_type: ml2.ovn
 
@@ -160,11 +160,15 @@ network_hosts:
   infra1:
     ip: 172.29.236.11
 
+network-northd_hosts:
+  infra1:
+    ip: 172.29.236.11
+
 neutron_ovn_northd:
   infra1:
     ip: 172.29.236.11
 
-network_gateway_hosts:
+network-gateway_hosts:
   infra1:
     ip: 172.29.236.11
 
diff --git a/inventory/devstack.yml b/inventory/devstack.yml
index 727f0c7..b36d992 100644
--- a/inventory/devstack.yml
+++ b/inventory/devstack.yml
@@ -4,9 +4,8 @@ all:
     ansible_user: ptoal
 control:
   hosts:
-    ospc.lab.toal.ca:
-      ansible_host: 172.29.236.11
+    infra1.osp.toal.ca:
 
 compute:
   hosts:
-    compute1.lab.toal.ca:
+    compute1.osp.toal.ca:
diff --git a/inventory/host_vars/compute1.lab.toal.ca/networking.yml b/inventory/host_vars/compute1.osp.toal.ca/networking.yml
similarity index 97%
rename from inventory/host_vars/compute1.lab.toal.ca/networking.yml
rename to inventory/host_vars/compute1.osp.toal.ca/networking.yml
index 5b44cf0..a85d792 100644
--- a/inventory/host_vars/compute1.lab.toal.ca/networking.yml
+++ b/inventory/host_vars/compute1.osp.toal.ca/networking.yml
@@ -18,8 +18,8 @@ network_state:
       state: up
       mtu: 9000
       ipv4:
-        enabled: true
-        dhcp: true
+        enabled: false
+        dhcp: false
     - name: ens2f1
       type: ethernet
       state: up
diff --git a/inventory/host_vars/ospc.lab.toal.ca/networking.yml b/inventory/host_vars/infra1.osp.toal.ca/networking.yml
similarity index 100%
rename from inventory/host_vars/ospc.lab.toal.ca/networking.yml
rename to inventory/host_vars/infra1.osp.toal.ca/networking.yml