diff --git a/libvirt/Dockerfile.ubuntu_bionic b/libvirt/Dockerfile.ubuntu_bionic
new file mode 100644
index 0000000..b7c6bbf
--- /dev/null
+++ b/libvirt/Dockerfile.ubuntu_bionic
@@ -0,0 +1,23 @@
+ARG FROM=docker.io/ubuntu:bionic
+FROM ${FROM}
+LABEL maintainer="pete.birley@att.com"
+
+ARG UBUNTU_RELEASE=bionic
+ARG CEPH_RELEASE=mimic
+ARG PROJECT=nova
+ARG UID=42424
+ARG GID=42424
+
+ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
+ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
+
+ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
+COPY ./ubuntu-install-libvirt.sh /tmp/ubuntu-install-libvirt.sh
+RUN set -ex ;\
+    export DEBIAN_FRONTEND=noninteractive ;\
+    apt-get update ;\
+    apt-get upgrade -y ;\
+    apt-get install --no-install-recommends -y \
+      gnupg ;\
+    /tmp/ubuntu-install-libvirt.sh ;\
+    rm -rf /tmp/*
diff --git a/libvirt/Dockerfile.ubuntu_xenial b/libvirt/Dockerfile.ubuntu_xenial
index 92f3ddb..6f44578 100644
--- a/libvirt/Dockerfile.ubuntu_xenial
+++ b/libvirt/Dockerfile.ubuntu_xenial
@@ -1,6 +1,8 @@
-FROM docker.io/ubuntu:xenial
+ARG FROM=docker.io/ubuntu:xenial
+FROM ${FROM}
 LABEL maintainer="pete.birley@att.com"
 
+ARG UBUNTU_RELEASE=xenial
 ARG CEPH_RELEASE=mimic
 ARG PROJECT=nova
 ARG UID=42424
@@ -10,34 +12,7 @@ ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
 ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
 
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
+COPY ./ubuntu-install-libvirt.sh /tmp/ubuntu-install-libvirt.sh
 RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
-    apt-get update ;\
-    apt-get upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-      ceph-common \
-      cgroup-tools \
-      dmidecode \
-      ebtables \
-      iproute2 \
-      libvirt-bin \
-      pm-utils \
-      qemu \
-      qemu-block-extra \
-      qemu-efi \
-      openvswitch-switch ;\
-    groupadd -g ${GID} ${PROJECT} ;\
-    useradd -u ${UID} -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} ;\
-    mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} ;\
-    chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} ;\
-    usermod -a -G kvm ${PROJECT} ;\
-    apt-get clean -y ;\
-    rm -rf \
-       /var/cache/debconf/* \
-       /var/lib/apt/lists/* \
-       /var/log/* \
-       /tmp/* \
-       /var/tmp/*
+    /tmp/ubuntu-install-libvirt.sh ;\
+    rm -rf /tmp/*
diff --git a/libvirt/ubuntu-install-libvirt.sh b/libvirt/ubuntu-install-libvirt.sh
new file mode 100755
index 0000000..afb19b6
--- /dev/null
+++ b/libvirt/ubuntu-install-libvirt.sh
@@ -0,0 +1,32 @@
+#/bin/bash
+set -ex
+export DEBIAN_FRONTEND=noninteractive ;\
+apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+echo "deb ${CEPH_REPO} ${UBUNTU_RELEASE} main" | tee /etc/apt/sources.list.d/ceph.list ;\
+apt-get update ;\
+apt-get upgrade -y ;\
+apt-get install --no-install-recommends -y \
+  ceph-common \
+  cgroup-tools \
+  dmidecode \
+  ebtables \
+  iproute2 \
+  libvirt-bin \
+  pm-utils \
+  qemu \
+  qemu-block-extra \
+  qemu-efi \
+  openvswitch-switch ;\
+groupadd -g ${GID} ${PROJECT} ;\
+useradd -u ${UID} -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} ;\
+mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} ;\
+chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} ;\
+usermod -a -G kvm ${PROJECT} ;\
+apt-get clean -y ;\
+rm -rf \
+   /var/cache/debconf/* \
+   /var/lib/apt/lists/* \
+   /var/log/* \
+   /tmp/* \
+   /var/tmp/*
diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml
index 253223f..a3513c7 100644
--- a/zuul.d/libvirt.yaml
+++ b/zuul.d/libvirt.yaml
@@ -46,6 +46,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: libvirt
+          repository: openstackhelm/libvirt
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
     files: &libvirt_files
       - libvirt/.*
       - zuul.d/libvirt.yaml