diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index 00a339d13a7..507a21e2893 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -386,11 +386,18 @@
           ((^neutron_tempest_plugin.api)|\
           (^neutron_tempest_plugin.scenario)|\
           (tempest.(api|scenario|thirdparty))).*$"
+      zuul_copy_output:
+        '{{ devstack_base_dir }}/data/ovs': 'logs'
+        '{{ devstack_base_dir }}/data/ovn': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
       devstack_localrc:
+        OVN_BUILD_FROM_SOURCE: True
         OVN_BRANCH: master
         OVS_BRANCH: master
     group-vars:
       subnode:
         devstack_localrc:
+          OVN_BUILD_FROM_SOURCE: True
           OVN_BRANCH: master
           OVS_BRANCH: master
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 70f68e9b9ae..eb215e03f72 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -473,7 +473,13 @@
     parent: neutron-ovn-base
     nodeset: devstack-single-node-fedora-latest
     vars:
+      zuul_copy_output:
+        '{{ devstack_base_dir }}/data/ovs': 'logs'
+        '{{ devstack_base_dir }}/data/ovn': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
       devstack_localrc:
+        OVN_BUILD_FROM_SOURCE: True
         OVN_BRANCH: master
         OVS_BRANCH: master
       devstack_services: