diff --git a/tempest/Dockerfile.ubuntu_bionic b/tempest/Dockerfile.ubuntu_bionic
new file mode 100644
index 0000000..a4b57fa
--- /dev/null
+++ b/tempest/Dockerfile.ubuntu_bionic
@@ -0,0 +1,25 @@
+FROM ubuntu:18.04
+
+RUN set -ex ;\
+    export DEBIAN_FRONTEND=noninteractive ;\
+    apt-get update ;\
+    apt-get upgrade -y ;\
+    apt-get install netbase -y ;\
+    apt-get install --no-install-recommends -y \
+        python3-dev \
+        build-essential \
+        python3-pip \
+        libssl-dev \
+        git ;\
+    git clone https://git.openstack.org/openstack/tempest ;\
+    git clone https://git.openstack.org/openstack/cinder-tempest-plugin ;\
+    git clone https://git.openstack.org/openstack/heat-tempest-plugin ;\
+    git clone https://git.openstack.org/openstack/keystone-tempest-plugin ;\
+    git clone https://git.openstack.org/openstack/neutron-tempest-plugin ;\
+    pip3 install -U setuptools ;\
+    pip3 install wheel ;\
+    pip3 install -e tempest/ \
+                    cinder-tempest-plugin/ \
+                    heat-tempest-plugin/ \
+                    keystone-tempest-plugin/ \
+                    neutron-tempest-plugin/ ;\
diff --git a/zuul.d/tempest.yaml b/zuul.d/tempest.yaml
index c2ca332..1bb8c52 100644
--- a/zuul.d/tempest.yaml
+++ b/zuul.d/tempest.yaml
@@ -40,6 +40,12 @@
           tags:
             - latest-ubuntu_xenial
             - "ubuntu_xenial-{{ currentdate }}"
+        - context: tempest
+          repository: openstackhelm/tempest
+          dockerfile: Dockerfile.ubuntu_bionic
+          tags:
+            - latest-ubuntu_bionic
+            - "ubuntu_bionic-{{ currentdate }}"
         - context: tempest
           repository: openstackhelm/tempest
           dockerfile: Dockerfile.opensuse_15