diff --git a/docker/launch.sh b/docker/launch.sh
index 7cc29ae36c..9d275315ad 100755
--- a/docker/launch.sh
+++ b/docker/launch.sh
@@ -9,7 +9,7 @@ fi
 
 # Build specified distributions
 if [[ -z $DISTROS ]]; then
-    DISTROS="ubuntu14.04"
+    DISTROS="ubuntu14.04 ubuntu16.04"
 fi
 
 for build in $BUILDS; do
diff --git a/docker/unstable/ubuntu16.04/Dockerfile b/docker/unstable/ubuntu16.04/Dockerfile
new file mode 100644
index 0000000000..dafb8933fe
--- /dev/null
+++ b/docker/unstable/ubuntu16.04/Dockerfile
@@ -0,0 +1,6 @@
+FROM powershell/powershell:stable-ubuntu16.04
+MAINTAINER Andrew Schwartzmeyer <andschwa@microsoft.com>
+
+COPY bootstrap.ps1 /
+RUN powershell -f bootstrap.ps1 \
+    && dpkg -i PowerShell/powershell*.deb