diff --git a/dockerfiles/infra/xenial/Dockerfile b/dockerfiles/infra/xenial/Dockerfile
new file mode 100644
index 0000000..ea0495e
--- /dev/null
+++ b/dockerfiles/infra/xenial/Dockerfile
@@ -0,0 +1,8 @@
+FROM ubuntu:xenial
+MAINTAINER OpenStack <openstack-dev@lists.openstack.org>
+
+RUN apt-get update --fix-missing
+RUN apt-get install -y build-essential wget git python python-dev
+
+RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm get-pip.py
+RUN pip install -U setuptools
diff --git a/tools/tarball.sh b/tools/tarball.sh
index 9004ea4..6d28eb6 100755
--- a/tools/tarball.sh
+++ b/tools/tarball.sh
@@ -20,7 +20,7 @@ if [ $(id -gn) != ${GROUP} ]; then
 fi
 
 ### Build image with docker
-IMAGES="infra/centos7 infra/trusty"
+IMAGES="infra/centos7 infra/trusty infra/xenial"
 for IMAGE in $IMAGES; do
     docker build dockerfiles/$IMAGE -t $IMAGE
 done