diff --git a/zuul.d/beaker.yaml b/zuul.d/beaker.yaml
index 1823eb85e..01bd2b4ce 100644
--- a/zuul.d/beaker.yaml
+++ b/zuul.d/beaker.yaml
@@ -38,6 +38,7 @@
     post-run: playbooks/upload-logs.yaml
     run: playbooks/run-libraries-beaker-tests.yaml
     timeout: 3600
+    voting: false
     nodeset: ubuntu-bionic
     irrelevant-files:
       - ^.*\.md$
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 2847401ba..e06b56825 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -106,6 +106,7 @@
     name: puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
     parent: puppet-openstack-integration-5-scenario001
     nodeset: ubuntu-bionic
+    voting: false
     vars:
       ceph: mimic
 
@@ -130,6 +131,7 @@
     name: puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-5-scenario002
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars:
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 31fe980e1..e7abad8bb 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -48,7 +48,6 @@
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
         - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
-        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
 
 # integration jobs
 - project-template:
@@ -69,8 +68,6 @@
         - puppet-openstack-integration-5-scenario002-tempest-centos-7
         - puppet-openstack-integration-5-scenario003-tempest-centos-7
         - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
     experimental:
       jobs:
         - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous: