diff --git a/zuul.d/ceph-cephfs-provisioner.yaml b/zuul.d/ceph-cephfs-provisioner.yaml
index 14d36f00..6b5f5354 100644
--- a/zuul.d/ceph-cephfs-provisioner.yaml
+++ b/zuul.d/ceph-cephfs-provisioner.yaml
@@ -40,6 +40,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: ceph-cephfs-provisioner
+          repository: openstackhelm/ceph-cephfs-provisioner
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
     files: &ceph-cephfs-provisioner_files
       - ceph-cephfs-provisioner/.*
       - zuul.d/ceph-cephfs-provisioner.yaml
diff --git a/zuul.d/ceph-config-helper.yaml b/zuul.d/ceph-config-helper.yaml
index 07f0d14e..fa2a56c9 100644
--- a/zuul.d/ceph-config-helper.yaml
+++ b/zuul.d/ceph-config-helper.yaml
@@ -46,6 +46,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: ceph-config-helper
+          repository: openstackhelm/ceph-config-helper
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
     files: &ceph-config-helper_files
       - ceph-config-helper/.*
       - zuul.d/ceph-config-helper.yaml
diff --git a/zuul.d/ceph-daemon.yaml b/zuul.d/ceph-daemon.yaml
index a150ce7f..216fcb73 100644
--- a/zuul.d/ceph-daemon.yaml
+++ b/zuul.d/ceph-daemon.yaml
@@ -40,6 +40,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: ceph-daemon
+          repository: openstackhelm/ceph-daemon
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
     files: &ceph-daemon_files
       - ceph-daemon/.*
       - zuul.d/ceph-daemon.yaml
diff --git a/zuul.d/ceph-rbd-provisioner.yaml b/zuul.d/ceph-rbd-provisioner.yaml
index 5b272296..c4e7611d 100644
--- a/zuul.d/ceph-rbd-provisioner.yaml
+++ b/zuul.d/ceph-rbd-provisioner.yaml
@@ -40,6 +40,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: ceph-rbd-provisioner
+          repository: openstackhelm/ceph-rbd-provisioner
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
     files: &ceph-rbd-provisioner_files
       - ceph-rbd-provisioner/.*
       - zuul.d/ceph-rbd-provisioner.yaml
diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml
index 8671872f..e2f680d1 100644
--- a/zuul.d/ceph-utility.yaml
+++ b/zuul.d/ceph-utility.yaml
@@ -40,6 +40,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: ceph-utility
+          repository: openstackhelm/ceph-utility
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
     files: &ceph-utility_files
       - ceph-utility/.*
       - zuul.d/ceph-utility.yaml