diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 1673526..ddb612b 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -123,6 +123,44 @@
           nodes:
             - zs01
 
+- job:
+    name: windmill-ubuntu-bionic
+    parent: windmill-base
+    nodeset:
+      nodes:
+        - name:
+            - bastion
+            - gear01
+            - nb01
+            - nl01
+            - ze01
+            - zk01
+            - zm01
+            - zs01
+          label: ubuntu-bionic
+      groups:
+        - name: gear
+          nodes:
+            - gear01
+        - name: nodepool-builder
+          nodes:
+            - nb01
+        - name: nodepool-launcher
+          nodes:
+            - nl01
+        - name: zookeeper
+          nodes:
+            - zk01
+        - name: zuul-executor
+          nodes:
+            - ze01
+        - name: zuul-merger
+          nodes:
+            - zm01
+        - name: zuul-scheduler
+          nodes:
+            - zs01
+
 - job:
     name: windmill-ubuntu-xenial
     parent: windmill-base
diff --git a/.zuul.d/project-templates.yaml b/.zuul.d/project-templates.yaml
index 396530a..b218907 100644
--- a/.zuul.d/project-templates.yaml
+++ b/.zuul.d/project-templates.yaml
@@ -39,6 +39,12 @@
         - windmill-fedora-27:
             voting: false
 
+- project-template:
+    name: windmill-jobs-bionic
+    check:
+      jobs:
+        - windmill-ubuntu-bionic
+
 - project-template:
     name: windmill-jobs-xenial
     check:
diff --git a/.zuul.d/projects.yaml b/.zuul.d/projects.yaml
index db42a5d..9642ef3 100644
--- a/.zuul.d/projects.yaml
+++ b/.zuul.d/projects.yaml
@@ -2,4 +2,5 @@
     templates:
       - ansible-role-jobs
       - windmill-jobs-fedora-27
+      - windmill-jobs-bionic
       - windmill-jobs-xenial
diff --git a/tests/base-minimal.yaml b/tests/base-minimal.yaml
index a61e879..654303a 100644
--- a/tests/base-minimal.yaml
+++ b/tests/base-minimal.yaml
@@ -4,7 +4,8 @@
     - use-cached-repos
     # - mirror-workspace-git-repos
     - mirror-info
-    - configure-mirrors
+    - role: configure-mirrors
+      set_apt_mirrors_trusted: True
 
   tasks:
     # NOTE(pabelanger): Because use-cache-repos force the delete of origin, the