diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent
index df07abba216..32042dfa113 100644
--- a/devstack/lib/ovn_agent
+++ b/devstack/lib/ovn_agent
@@ -145,7 +145,8 @@ function is_kernel_module_loaded {
 function use_new_ovn_repository {
     # IF OVN_BRANCH is "master" or branch-2.13 (or higher), use the new
     # OVN repository
-    return $(! printf "%s\n%s" $OVN_BRANCH branch-2.12 | sort -C -V)
+    [ "$OVN_BRANCH" == "master" ] && return 0
+    return $(! printf "%s\n%s" ${OVN_BRANCH//[!0-9.]/} 2.12 | sort -C -V)
 }
 
 # NOTE(rtheis): Function copied from DevStack _neutron_ovs_base_setup_bridge
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 5a976526f0f..bc4539f77c3 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -282,8 +282,8 @@
     parent: neutron-ovn-tempest-ovs-ipv6-only-base
     vars:
       devstack_localrc:
-        OVN_BRANCH: branch-2.12
-        OVS_BRANCH: branch-2.12
+        OVN_BRANCH: v20.03.0
+        OVS_BRANCH: v2.13.0
 
 - job:
     name: neutron-ovn-tempest-ovs-release
@@ -291,8 +291,8 @@
     parent: neutron-ovn-base
     vars:
       devstack_localrc:
-        OVN_BRANCH: branch-2.12
-        OVS_BRANCH: branch-2.12
+        OVN_BRANCH: v20.03.0
+        OVS_BRANCH: v2.13.0
 
 - job:
     name: neutron-ovn-tempest-ovs-master-fedora