diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 002564905..f1d2b24e0 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -31,6 +31,8 @@
           devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
           kuryr-tempest-plugin: https://opendev.org/openstack/kuryr-tempest-plugin
     vars:
+      # Default swap size got shrinked to 1 GB, it's way too small for us.
+      configure_swap_size: 8192
       tempest_test_regex: '^(kuryr_tempest_plugin.tests.)'
       tox_envlist: 'all'
       devstack_localrc:
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 5f7623e23..a39bc04ee 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -44,11 +44,22 @@
         - kuryr-kubernetes-tempest-multinode-ha
         - kuryr-kubernetes-tempest-containerized-crio
 
+- project-template:
+    name: kuryr-kubernetes-lower-constraints-bionic-jobs
+    check:
+      jobs:
+      - openstack-tox-lower-constraints:
+          nodeset: ubuntu-bionic
+    gate:
+      jobs:
+      - openstack-tox-lower-constraints:
+          nodeset: ubuntu-bionic
+
 - project:
     templates:
       - openstack-python3-victoria-jobs
-      - openstack-lower-constraints-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - check-requirements
+      - kuryr-kubernetes-lower-constraints-bionic-jobs
       - kuryr-kubernetes-tempest-jobs
diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml
index 5d946c062..890ae5c1a 100644
--- a/.zuul.d/sdn.yaml
+++ b/.zuul.d/sdn.yaml
@@ -26,6 +26,8 @@
     vars:
       devstack_localrc:
         Q_AGENT: ovn
+        ML2_L3_PLUGIN: ovn-router,trunk
+        OVN_DBS_LOG_LEVEL: dbg
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
         Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
         Q_ML2_TENANT_NETWORK_TYPE: geneve
@@ -33,10 +35,10 @@
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
         PHYSICAL_NETWORK: public
         OVN_L3_CREATE_PUBLIC_NETWORK: true
-        # OVN already builds from source by default
-        Q_BUILD_OVS_FROM_GIT: false
+        ENABLE_CHASSIS_AS_GW: true
+        OVN_BRANCH: v20.06.1
         KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
-        OVN_BRANCH: branch-20.06
+        ENABLE_TLS: True
       devstack_services:
         ovn-northd: true
         ovn-controller: true
@@ -47,6 +49,12 @@
         q-dhcp: false
         q-meta: false
         q-trunk: true
+        ovs-vswitchd: true
+        ovsdb-server: true
+      zuul_copy_output:
+        '{{ devstack_base_dir }}/data/ovn': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
 
 - job:
     name: kuryr-kubernetes-tempest-containerized-ovn
@@ -143,7 +151,6 @@
         KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
         KURYR_ENFORCE_SG_RULES: false
         KURYR_LB_ALGORITHM: SOURCE_IP_PORT
-        KURYR_HYPERKUBE_VERSION: v1.16.0
         KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
         KURYR_SG_DRIVER: policy
         KURYR_SUBNET_DRIVER: namespace