diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a33bfb85c0..5ca1649e22 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -37,25 +37,17 @@ if is_service_enabled ir-api ir-cond; then
 
             if [[ "$IRONIC_BAREMETAL_BASIC_OPS" == "True" && "$IRONIC_IS_HARDWARE" == "False" ]]; then
                 echo_summary "Precreating bridge: $IRONIC_VM_NETWORK_BRIDGE"
-                if [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
-                    if [[ "$Q_AGENT" == "ovn" ]]; then
-                        # If we're here, we were requested to install from git
-                        # for OVN *and* OVS, but that means basic setup has not been
-                        # performed yet. As such, we need to do that and start
-                        # OVN/OVS where as if we just need to ensure OVS is present,
-                        # vendor packaging does that for us. We start early here,
-                        # because neutron setup for this is deferred until too late
-                        # for our plugin to setup the test environment.
-                        echo_summary "Setting up OVN..."
-                        init_ovn
-                        start_ovn
-                    fi
-                else
+                if [[ "$Q_BUILD_OVS_FROM_GIT" != "True" ]]; then
                     # NOTE(TheJulia): We are likely doing this to ensure
                     # OVS is running.
                     echo_summary "Installing OVS to pre-create bridge"
                     install_package openvswitch-switch
                 fi
+                if [[ "$Q_AGENT" == "ovn" ]]; then
+                    echo_summary "Setting up OVN..."
+                    init_ovn
+                    start_ovn
+                fi
                 sudo ovs-vsctl -- --may-exist add-br $IRONIC_VM_NETWORK_BRIDGE
             fi
 
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 70cc094ffc..c8e07aa24b 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -468,15 +468,6 @@
         ENABLE_CHASSIS_AS_GW: True
         ML2_L3_PLUGIN: "ovn-router,trunk"
         OVN_DBS_LOG_LEVEL: dbg
-        OVN_BUILD_FROM_SOURCE: True
-        Q_BUILD_OVS_FROM_GIT: True
-        # NOTE(TheJulia): Ubuntu ships an out of date OVN package, so
-        # we need to build from source. These are the minimum versions
-        # representing June 2023 release. Ubuntu Kinetic is shipping Q3 2022
-        # i.e. OVN 22.09, so likely possible to remove sometime *after*
-        # Ubuntu Mantic OVN 2023.03.
-        OVN_BRANCH: v23.09.0
-        OVS_BRANCH: v3.2.0-20-g1d78a3f31
       devstack_services:
         q-agt: False
         q-dhcp: False
@@ -513,15 +504,6 @@
         ENABLE_CHASSIS_AS_GW: True
         ML2_L3_PLUGIN: "ovn-router,trunk"
         OVN_DBS_LOG_LEVEL: dbg
-        OVN_BUILD_FROM_SOURCE: True
-        Q_BUILD_OVS_FROM_GIT: True
-        # NOTE(TheJulia): Ubuntu ships an out of date OVN package, so
-        # we need to build from source. These are the minimum versions
-        # representing June 2023 release. Ubuntu Kinetic is shipping Q3 2022
-        # i.e. OVN 22.09, so likely possible to remove sometime *after*
-        # Ubuntu Mantic which is OVN 2023.03.
-        OVN_BRANCH: v23.09.0
-        OVS_BRANCH: v3.2.0-20-g1d78a3f31
       devstack_services:
         q-agt: False
         q-dhcp: False