diff --git a/.zuul.yaml b/.zuul.yaml
index bd464111..adbb9dc8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,86 +1,60 @@
 - project:
+    templates:
+      - check-requirements
+      - lib-forward-testing
+      - lib-forward-testing-python3
+      - openstack-cover-jobs
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - openstack-python36-jobs
+      - periodic-stable-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
     check:
       jobs:
         - tooz-tox-py27-etcd
-        - tooz-tox-py35-etcd:
-            branches: ^(?!stable/newton).*$
-        - tooz-tox-py27-etcd3:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - tooz-tox-py35-etcd3:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - tooz-tox-py27-etcd3gw:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - tooz-tox-py35-etcd3gw:
-            branches: ^(?!stable/(newton|ocata)).*$
+        - tooz-tox-py35-etcd
+        - tooz-tox-py27-etcd3
+        - tooz-tox-py35-etcd3
+        - tooz-tox-py27-etcd3gw
+        - tooz-tox-py35-etcd3gw
         - tooz-tox-py27-zookeeper
-        - tooz-tox-py35-zookeeper:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-zookeeper
         - tooz-tox-py27-redis
-        - tooz-tox-py35-redis:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-redis
         - tooz-tox-py27-sentinel
-        - tooz-tox-py35-sentinel:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-sentinel
         - tooz-tox-py27-memcached
-        - tooz-tox-py35-memcached:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-memcached
         - tooz-tox-py27-postgresql
-        - tooz-tox-py35-postgresql:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-postgresql
         - tooz-tox-py27-mysql
-        - tooz-tox-py35-mysql:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-mysql
         - tooz-tox-py27-consul
-        - tooz-tox-py35-consul:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-consul
     gate:
       jobs:
         - tooz-tox-py27-etcd
-        - tooz-tox-py35-etcd:
-            branches: ^(?!stable/newton).*$
-        - tooz-tox-py27-etcd3:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - tooz-tox-py35-etcd3:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - tooz-tox-py27-etcd3gw:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - tooz-tox-py35-etcd3gw:
-            branches: ^(?!stable/(newton|ocata)).*$
+        - tooz-tox-py35-etcd
+        - tooz-tox-py27-etcd3
+        - tooz-tox-py35-etcd3
+        - tooz-tox-py27-etcd3gw
+        - tooz-tox-py35-etcd3gw
         - tooz-tox-py27-zookeeper
-        - tooz-tox-py35-zookeeper:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-zookeeper
         - tooz-tox-py27-redis
-        - tooz-tox-py35-redis:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-redis
         - tooz-tox-py27-sentinel
-        - tooz-tox-py35-sentinel:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-sentinel
         - tooz-tox-py27-memcached
-        - tooz-tox-py35-memcached:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-memcached
         - tooz-tox-py27-postgresql
-        - tooz-tox-py35-postgresql:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-postgresql
         - tooz-tox-py27-mysql
-        - tooz-tox-py35-mysql:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-mysql
         - tooz-tox-py27-consul
-        - tooz-tox-py35-consul:
-            branches: ^(?!stable/newton).*$
+        - tooz-tox-py35-consul
 
-    templates:
-      - check-requirements
-      - openstack-python-jobs
-      - openstack-python35-jobs
-      - publish-openstack-docs-pti
-      - lib-forward-testing
-      - lib-forward-testing-python3
-      - release-notes-jobs-python3
-      - periodic-stable-jobs
-      - openstack-python36-jobs
-    post:
-      jobs:
-        - openstack-tox-cover
 - job:
     name: tooz-tox-py27-consul
     parent: openstack-tox