diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index aff85eb..2c6dce8 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,7 +8,9 @@
         # NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
         - ironic-standalone
         - ironic-dsvm-standalone-rocky
-        - ironic-dsvm-standalone-queens
+        # NOTE(iurygregory): we want to make voting again
+        - ironic-dsvm-standalone-queens:
+            voting: false
         - ironic-dsvm-standalone-pike:
             voting: false
         - ironic-tempest-functional-python3
@@ -20,6 +22,8 @@
             voting: false
         # NOTE(dtantsur): these jobs cover rarely changed tests and are quite
         # unstable, so keep them non-voting on stable branches.
+        # NOTE(iurygregory):  debug rocky and queens
+        # since before was working, pike was broken before
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky:
             voting: false
@@ -27,23 +31,24 @@
             voting: false
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike:
             voting: false
-        - ironic-inspector-tempest-dsvm-discovery
+        - ironic-inspector-tempest-discovery
         - ironic-inspector-tempest-dsvm-discovery-rocky:
             voting: false
         - ironic-inspector-tempest-dsvm-discovery-queens:
             voting: false
+        # NOTE(iurygregory): we may want to debug why its failling since before was green
         - ironic-inspector-tempest-dsvm-discovery-pike:
             voting: false
     gate:
       queue: ironic
       jobs:
+        # NOTE(iurygregory): re add ironic-dsvm-standalone-queens when is green again
         - ironic-standalone
         - ironic-dsvm-standalone-rocky
-        - ironic-dsvm-standalone-queens
         - ironic-tempest-functional-python3
         - ironic-tempest-dsvm-functional-python3-rocky
         - ironic-inspector-tempest
         - ironic-tempest-dsvm-ironic-inspector-rocky
         - ironic-tempest-dsvm-ironic-inspector-queens
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-        - ironic-inspector-tempest-dsvm-discovery
+        - ironic-inspector-tempest-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index c25865a..e4cf069 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,65 +1,136 @@
----
 - job:
     name: ironic-dsvm-standalone-rocky
     parent: ironic-standalone
-    override-checkout: stable/rocky
+    override-branch: stable/rocky
+    nodeset: openstack-single-node-xenial
 
 - job:
     name: ironic-dsvm-standalone-queens
     parent: ironic-standalone
-    override-checkout: stable/queens
+    override-branch: stable/queens
+    nodeset: openstack-single-node-xenial
+    vars:
+      devstack_localrc:
+        FIXED_NETWORK_SIZE: 4096
+        EBTABLES_RACE_FIX: True
+        IRONIC_USE_MOD_WSGI: True
+
 
 - job:
     name: ironic-dsvm-standalone-pike
     parent: ironic-standalone
-    override-checkout: stable/pike
+    override-branch: stable/pike
+    nodeset: openstack-single-node-xenial
 
 - job:
     name: ironic-tempest-dsvm-functional-python3-rocky
     parent: ironic-tempest-functional-python3
-    override-checkout: stable/rocky
+    override-branch: stable/rocky
+    nodeset: openstack-single-node-xenial
+    vars:
+      devstack_localrc:
+        IRONIC_RPC_TRANSPORT: ""
+      devstack_services:
+        rabbit: True
 
 - job:
     name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky
     parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-    override-checkout: stable/rocky
+    override-branch: stable/rocky
+    nodeset: openstack-two-node-xenial
+    vars:
+      devstack_localrc:
+        IRONIC_DEFAULT_BOOT_OPTION: netboot
+        FIXED_NETWORK_SIZE: 4096
+        IRONIC_DEFAULT_RESCUE_INTERFACE: agent
+        EBTABLES_RACE_FIX: True
+        PUBLIC_BRIDGE: br_ironic_vxlan
+        OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br_ironic_vxlan'
+    group-vars:
+      subnode:
+        devstack_localrc:
+          OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br_ironic_vxlan'
 
 - job:
     name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens
     parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-    override-checkout: stable/queens
+    override-branch: stable/queens
+    nodeset: openstack-two-node-xenial
+    vars:
+      devstack_localrc:
+        IRONIC_DEFAULT_BOOT_OPTION: netboot
+        FIXED_NETWORK_SIZE: 4096
+        IRONIC_DEFAULT_RESCUE_INTERFACE: agent
+        EBTABLES_RACE_FIX: True
+        PUBLIC_BRIDGE: br_ironic_vxlan
+        OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br_ironic_vxlan'
+    group-vars:
+      subnode:
+        devstack_localrc:
+          OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br_ironic_vxlan'
 
 - job:
     name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike
     parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-    override-checkout: stable/pike
+    override-branch: stable/pike
+    nodeset: openstack-two-node-xenial
+    vars:
+      devstack_localrc:
+        IRONIC_DEFAULT_BOOT_OPTION: netboot
+        FIXED_NETWORK_SIZE: 4096
+        IRONIC_DEFAULT_RESCUE_INTERFACE: agent
+        EBTABLES_RACE_FIX: True
+        PUBLIC_BRIDGE: br_ironic_vxlan
+        OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br_ironic_vxlan'
+    group-vars:
+      subnode:
+        devstack_localrc:
+          OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br_ironic_vxlan'
 
 - job:
     name: ironic-tempest-dsvm-ironic-inspector-rocky
     parent: ironic-inspector-tempest
-    override-checkout: stable/rocky
+    override-branch: stable/rocky
+    nodeset: openstack-single-node-xenial
+    vars:
+      devstack_localrc:
+        FIXED_NETWORK_SIZE: 4096
+        EBTABLES_RACE_FIX: True
 
 - job:
     name: ironic-tempest-dsvm-ironic-inspector-queens
     parent: ironic-inspector-tempest
-    override-checkout: stable/queens
+    override-branch: stable/queens
+    nodeset: openstack-single-node-xenial
+    vars:
+      devstack_localrc:
+        FIXED_NETWORK_SIZE: 4096
+        EBTABLES_RACE_FIX: True
 
 - job:
     name: ironic-tempest-dsvm-ironic-inspector-pike
     parent: ironic-inspector-tempest
-    override-checkout: stable/pike
+    override-branch: stable/pike
+    nodeset: openstack-single-node-xenial
+    vars:
+      devstack_localrc:
+        FIXED_NETWORK_SIZE: 4096
+        EBTABLES_RACE_FIX: True
 
 - job:
     name: ironic-inspector-tempest-dsvm-discovery-rocky
-    parent: ironic-inspector-tempest-dsvm-discovery
-    override-checkout: stable/rocky
+    parent: ironic-inspector-tempest-discovery
+    override-branch: stable/rocky
+    nodeset: openstack-single-node-xenial
 
 - job:
     name: ironic-inspector-tempest-dsvm-discovery-queens
-    parent: ironic-inspector-tempest-dsvm-discovery
-    override-checkout: stable/queens
+    parent: ironic-inspector-tempest-discovery
+    override-branch: stable/queens
+    nodeset: openstack-single-node-xenial
 
 - job:
     name: ironic-inspector-tempest-dsvm-discovery-pike
-    parent: ironic-inspector-tempest-dsvm-discovery
-    override-checkout: stable/pike
+    parent: ironic-inspector-tempest-discovery
+    override-branch: stable/pike
+    nodeset: openstack-single-node-xenial