diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml
index 6bd889ecd..3ec051a41 100644
--- a/zuul.d/bifrost-jobs.yaml
+++ b/zuul.d/bifrost-jobs.yaml
@@ -91,6 +91,11 @@
     parent: bifrost-integration-tinyipa
     nodeset: ubuntu-xenial
 
+- job:
+    name: bifrost-integration-tinyipa-ubuntu-bionic
+    parent: bifrost-integration-tinyipa
+    nodeset: ubuntu-bionic
+
 - job:
     name: bifrost-integration-tinyipa-keystone-ubuntu-xenial
     parent: bifrost-integration-tinyipa
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 919599003..1590860ad 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,28 +7,31 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - bifrost-integration-tinyipa-ubuntu-xenial
-        - bifrost-integration-tinyipa-keystone-ubuntu-xenial
-        - bifrost-integration-tinyipa-opensuse-15
+        - bifrost-integration-tinyipa-ubuntu-xenial:
+            voting: false
+        - bifrost-integration-tinyipa-ubuntu-bionic:
+            voting: false
+        # - bifrost-integration-tinyipa-keystone-ubuntu-xenial
+        # - bifrost-integration-tinyipa-opensuse-15
         # Non-voting jobs
-        - bifrost-integration-dhcp-ubuntu-xenial:
-            voting: false
-        - bifrost-integration-dhcp-opensuse-15:
-            voting: false
-        - bifrost-integration-dhcp-centos-7:
-            voting: false
-        - bifrost-integration-dibipa-debian-centos-7:
-            voting: false
-        - bifrost-integration-dibipa-debian-ubuntu-xenial:
-            voting: false
-        - bifrost-integration-dibipa-debian-opensuse-15:
-            voting: false
-        - bifrost-integration-tinyipa-centos-7:
-            voting: false
+        # - bifrost-integration-dhcp-ubuntu-xenial:
+        #    voting: false
+        # - bifrost-integration-dhcp-opensuse-15:
+        #    voting: false
+        # - bifrost-integration-dhcp-centos-7:
+        #    voting: false
+        # - bifrost-integration-dibipa-debian-centos-7:
+        #    voting: false
+        # - bifrost-integration-dibipa-debian-ubuntu-xenial:
+        #    voting: false
+        # - bifrost-integration-dibipa-debian-opensuse-15:
+        #    voting: false
+        # - bifrost-integration-tinyipa-centos-7:
+        #    voting: false
         - openstack-tox-lower-constraints
     gate:
       jobs:
-        - bifrost-integration-tinyipa-ubuntu-xenial
-        - bifrost-integration-tinyipa-keystone-ubuntu-xenial
-        - bifrost-integration-tinyipa-opensuse-15
+        # - bifrost-integration-tinyipa-ubuntu-xenial
+        # - bifrost-integration-tinyipa-keystone-ubuntu-xenial
+        # - bifrost-integration-tinyipa-opensuse-15
         - openstack-tox-lower-constraints