diff --git a/.zuul.yaml b/.zuul.yaml
index 9e0469389e..268c880387 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -71,6 +71,8 @@
       - ^doc/.*
     vars:
       scenario: aio
+    roles:
+        - zuul: openstack-infra/zuul-jobs
 
 - job:
     name: kolla-ansible-centos-source
diff --git a/tests/pre.yml b/tests/pre.yml
index d236f6f535..446575bee2 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -29,10 +29,5 @@
       hostname:
         name: "{{ inventory_hostname }}"
       become: true
-
-# TODO(inc0): we're dropping iptables rules but in fact we should create
-# linuxbridge-managed tunnels for control and dataplane
-
-    - name: Drop iptables rules
-      command: "iptables -F"
-      become: true
+  roles:
+    - multi-node-firewall