diff --git a/.zuul.yaml b/.zuul.yaml
index fcd103fbd2..066deeb620 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -315,7 +315,6 @@
     required-projects:
       - opendev.org/openstack/devstack
     roles:
-      - zuul: opendev.org/openstack/devstack-gate
       - zuul: opendev.org/openstack/openstack-zuul-jobs
     vars:
       devstack_localrc:
@@ -760,6 +759,9 @@
         - ironic-tempest-bios-ipmi-direct-tinyipa
         - swift-dsvm-functional
         - grenade:
+            # NOTE(elod.illes): needs to be set back as voting, when grenade
+            # patch merges: https://review.opendev.org/919818
+            voting: false
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
@@ -790,6 +792,7 @@
               - ^.*\.rst$
               - ^doc/.*$
         - nova-ceph-multistore:
+            voting: false
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
@@ -812,6 +815,9 @@
         - ironic-tempest-bios-ipmi-direct-tinyipa
         - swift-dsvm-functional
         - grenade:
+            # NOTE(elod.illes): needs to be set back as voting, when grenade
+            # patch merges: https://review.opendev.org/919818
+            voting: false
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
@@ -823,10 +829,13 @@
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
-        - nova-ceph-multistore:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
+        # TODO(elod.illes): nova-ceph-multistore is broken in this branch,
+        # so it is set as non-voting in check queue and commented out here
+        # in gate queue until the job gets fixed.
+        # - nova-ceph-multistore:
+        #     irrelevant-files:
+        #       - ^.*\.rst$
+        #       - ^doc/.*$
     # Please add a note on each job and conditions for the job not
     # being experimental any more, so we can keep this list somewhat
     # pruned.