diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 896a052492..1f87707ec0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -466,8 +466,6 @@ project-templates:
   - name: release-notes-jobs
     check:
       - 'gate-{name}-tox-releasenotes'
-    gate:
-      - 'gate-{name}-tox-releasenotes'
 
   - name: openstack-server-release-jobs-constraints
     pre-release:
@@ -2066,6 +2064,10 @@ jobs:
   - name: gate-tempest-dsvm-neutron-full-ssh
     voting: false
 
+  - name: ^gate-.*-tox-releasenotes$
+    branch: ^(?!stable/(?:juno|kilo)).*$
+    voting: false
+
   # Constraints Jobs
   - name: ^gate-.*-constraints$
     branch: ^(?!stable/(?:juno|kilo)).*$