diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 99dcf388..c8367b9f 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -7591,6 +7591,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-docs-newton/run
     timeout: 2400
+    branches: stable/newton
     required-projects:
       - openstack/requirements
 
@@ -7599,6 +7600,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-docs-ocata/run
     timeout: 2400
+    branches: stable/ocata
     required-projects:
       - openstack/requirements
 
@@ -7607,6 +7609,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-docs-pike/run
     timeout: 2400
+    branches: stable/pike
     required-projects:
       - openstack/requirements
 
@@ -7749,6 +7752,7 @@
     run: playbooks/legacy/periodic-neutron-dynamic-routing-dsvm-tempest-with-ryu-master-scenario-ipv4/run
     post-run: playbooks/legacy/periodic-neutron-dynamic-routing-dsvm-tempest-with-ryu-master-scenario-ipv4/post
     timeout: 7800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -7760,6 +7764,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-master/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-master/post
+    branches: master
     timeout: 10800
 
 - job:
@@ -7768,6 +7773,7 @@
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-master-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-master-centos-7/post
     timeout: 10800
+    branches: master
     nodeset: legacy-centos-7
 
 - job:
@@ -7776,6 +7782,7 @@
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-master-opensuse-423/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-master-opensuse-423/post
     timeout: 10800
+    branches: master
     nodeset: legacy-opensuse-423
 
 - job:
@@ -7783,6 +7790,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-ocata/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-ocata/post
+    branches: stable/ocata
     timeout: 10800
 
 - job:
@@ -7790,6 +7798,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-ocata-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-ocata-centos-7/post
+    branches: stable/ocata
     timeout: 10800
     nodeset: legacy-centos-7
 
@@ -7798,6 +7807,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-pike/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-pike/post
+    branches: stable/pike
     timeout: 10800
 
 - job:
@@ -7806,6 +7816,7 @@
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-pike-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-pike-centos-7/post
     timeout: 10800
+    branches: stable/pike
     nodeset: legacy-centos-7
 
 - job:
@@ -7814,6 +7825,7 @@
     run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-pike-opensuse-423/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-aio-pike-opensuse-423/post
     timeout: 10800
+    branches: stable/pike
     nodeset: legacy-opensuse-423
 
 - job:
@@ -7821,6 +7833,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-master/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-master/post
+    branches: master
     timeout: 10800
 
 - job:
@@ -7829,6 +7842,7 @@
     run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-master-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-master-centos-7/post
     timeout: 10800
+    branches: master
     nodeset: legacy-centos-7
 
 - job:
@@ -7836,6 +7850,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-ocata/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-ocata/post
+    branches: stable/ocata
     timeout: 10800
 
 - job:
@@ -7843,6 +7858,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-ocata-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-ocata-centos-7/post
+    branches: stable/ocata
     timeout: 10800
     nodeset: legacy-centos-7
 
@@ -7851,6 +7867,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-pike/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-pike/post
+    branches: stable/pike
     timeout: 10800
 
 - job:
@@ -7859,6 +7876,7 @@
     run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-pike-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-ceph-pike-centos-7/post
     timeout: 10800
+    branches: stable/pike
     nodeset: legacy-centos-7
 
 - job:
@@ -7866,6 +7884,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-deploy-translations-master/run
     post-run: playbooks/legacy/periodic-openstack-ansible-deploy-translations-master/post
+    branches: master
     timeout: 10800
 
 - job:
@@ -7873,6 +7892,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-master/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-master/post
+    branches: master
     timeout: 10800
 
 - job:
@@ -7880,6 +7900,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-master-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-master-centos-7/post
+    branches: master
     timeout: 10800
     nodeset: legacy-centos-7
 
@@ -7888,6 +7909,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-ocata/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-ocata/post
+    branches: stable/ocata
     timeout: 10800
 
 - job:
@@ -7895,6 +7917,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-pike/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-pike/post
+    branches: stable/pike
     timeout: 10800
 
 - job:
@@ -7902,6 +7925,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-pike-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-aio-pike-centos-7/post
+    branches: stable/pike
     timeout: 10800
     nodeset: legacy-centos-7
 
@@ -7910,6 +7934,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-master/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-master/post
+    branches: master
     timeout: 10800
 
 - job:
@@ -7917,6 +7942,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-master-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-master-centos-7/post
+    branches: master
     timeout: 10800
     nodeset: legacy-centos-7
 
@@ -7925,6 +7951,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-pike/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-pike/post
+    branches: stable/pike
     timeout: 10800
 
 - job:
@@ -7932,6 +7959,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-pike-centos-7/run
     post-run: playbooks/legacy/periodic-openstack-ansible-upgrade-ceph-pike-centos-7/post
+    branches: stable/pike
     timeout: 10800
     nodeset: legacy-centos-7
 
@@ -7940,6 +7968,7 @@
     parent: legacy-publish-openstack-artifacts
     run: playbooks/legacy/periodic-package-stackviz-element/run
     post-run: playbooks/legacy/periodic-package-stackviz-element/post
+    branches: master
     timeout: 1800
 
 - job:
@@ -7947,6 +7976,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-py27-with-oslo-master/run
     post-run: playbooks/legacy/periodic-py27-with-oslo-master/post
+    branches: master
     timeout: 3000
     required-projects:
       - openstack/requirements
@@ -7956,6 +7986,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-py35-with-neutron-lib-master/run
     post-run: playbooks/legacy/periodic-py35-with-neutron-lib-master/post
+    branches: master
     timeout: 3000
     required-projects:
       - openstack/requirements
@@ -7965,6 +7996,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-py35-with-oslo-master/run
     post-run: playbooks/legacy/periodic-py35-with-oslo-master/post
+    branches: master
     timeout: 3000
     required-projects:
       - openstack/requirements
@@ -7974,6 +8006,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-py35-with-ovsdbapp-master/run
     post-run: playbooks/legacy/periodic-py35-with-ovsdbapp-master/post
+    branches: master
     timeout: 3000
     required-projects:
       - openstack/requirements
@@ -7983,6 +8016,7 @@
     parent: legacy-base
     run: playbooks/legacy/periodic-python27-newton/run
     post-run: playbooks/legacy/periodic-python27-newton/post
+    branches: stable/newton
     timeout: 2400
     required-projects:
       - openstack/requirements
@@ -7993,6 +8027,7 @@
     run: playbooks/legacy/periodic-python27-ocata/run
     post-run: playbooks/legacy/periodic-python27-ocata/post
     timeout: 2400
+    branches: stable/ocata
     required-projects:
       - openstack/requirements
 
@@ -8002,6 +8037,7 @@
     run: playbooks/legacy/periodic-python27-pike/run
     post-run: playbooks/legacy/periodic-python27-pike/post
     timeout: 2400
+    branches: stable/pike
     required-projects:
       - openstack/requirements
 
@@ -8011,6 +8047,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-all-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-all-master/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/tempest
@@ -8021,6 +8058,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-full-test-accounts-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-full-test-accounts-master/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/tempest
@@ -8031,6 +8069,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-networking-calico-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-networking-calico-master/post
     timeout: 7800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/networking-calico
@@ -8042,6 +8081,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/post
     timeout: 7800
+    branches: stable/ocata
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/networking-l2gw
@@ -8055,6 +8095,7 @@
     parent: legacy-dsvm-base
     run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-newton/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-newton/post
+    branches: stable/newton
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -8069,6 +8110,7 @@
     parent: legacy-dsvm-base
     run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/post
+    branches: stable/ocata
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -8083,6 +8125,7 @@
     parent: legacy-dsvm-base
     run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-newton/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-newton/post
+    branches: stable/newton
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -8098,6 +8141,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-networking-sfc/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-networking-sfc/post
     timeout: 7800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/networking-sfc
@@ -8109,6 +8153,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/post
     timeout: 10800
+    branches: stable/newton
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -8120,6 +8165,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-non-admin-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-non-admin-master/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -8130,6 +8176,7 @@
     parent: legacy-dsvm-base
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-ocata/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-ocata/post
+    branches: stable/ocata
     timeout: 10800
     required-projects:
       - openstack-infra/devstack-gate
@@ -8142,6 +8189,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-pike/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-pike/post
     timeout: 10800
+    branches: stable/pike
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -8153,6 +8201,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-test-accounts-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-test-accounts-master/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -8164,6 +8213,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -8175,6 +8225,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/neutron
@@ -8185,6 +8236,7 @@
     parent: legacy-dsvm-base
     run: playbooks/legacy/periodic-tempest-dsvm-nnet-newton/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-nnet-newton/post
+    branches: stable/newton
     timeout: 10800
     required-projects:
       - openstack-infra/devstack-gate
@@ -8196,6 +8248,7 @@
     run: playbooks/legacy/periodic-tempest-dsvm-oslo-latest-full-master/run
     post-run: playbooks/legacy/periodic-tempest-dsvm-oslo-latest-full-master/post
     timeout: 10800
+    branches: master
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/oslo.cache
@@ -8320,6 +8373,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024/post
+    branches: master
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8328,6 +8382,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-fakeha-caserver/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-fakeha-caserver/post
+    branches: master
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8336,6 +8391,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-newton-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-newton-oooq/post
+    branches: stable/newton
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8344,6 +8400,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-ocata-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-ocata-oooq/post
+    branches: stable/ocata
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8352,6 +8409,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-oooq/post
+    branches: master
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8360,6 +8418,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-pike-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-pike-oooq/post
+    branches: stable/pike
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8368,6 +8427,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-containers/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-containers/post
+    branches: master
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8376,6 +8436,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-master/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-master/post
+    branches: master
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8384,6 +8445,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-ocata/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-ocata/post
+    branches: stable/ocata
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8392,6 +8454,7 @@
     parent: legacy-tripleo-ci-dsvm
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-pike/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-pike/post
+    branches: stable/pike
     timeout: 10800
     nodeset: legacy-tripleo-centos-7
 
@@ -8400,6 +8463,7 @@
     parent: legacy-tripleo-ci-dsvm-multinode
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario001-multinode-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario001-multinode-oooq/post
+    branches: master
     timeout: 10800
     nodeset: legacy-centos-7-2-node
 
@@ -8408,6 +8472,7 @@
     parent: legacy-tripleo-ci-dsvm-multinode
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario002-multinode-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario002-multinode-oooq/post
+    branches: master
     timeout: 10800
     nodeset: legacy-centos-7-2-node
 
@@ -8416,6 +8481,7 @@
     parent: legacy-tripleo-ci-dsvm-multinode
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario003-multinode-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario003-multinode-oooq/post
+    branches: master
     timeout: 10800
     nodeset: legacy-centos-7-2-node
 
@@ -8424,6 +8490,7 @@
     parent: legacy-tripleo-ci-dsvm-multinode
     run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario004-multinode-oooq/run
     post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-scenario004-multinode-oooq/post
+    branches: master
     timeout: 10800
     nodeset: legacy-centos-7-2-node
 
@@ -8464,6 +8531,7 @@
 - job:
     name: legacy-propose-requirements-constraints-master
     parent: legacy-base
+    branches: master
     run: playbooks/legacy/propose-requirements-constraints-master/run
     timeout: 1800