diff --git a/Dockerfile b/Dockerfile
index 5fe6384c9e..35fa9a1b39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,7 @@ ARG GitVersionZip
 # Add GitVersion
 
 ADD ./releaseArtifacts/$GitVersionZip .
-RUN unzip -d /usr/lib/GitVersion/ $GitVersionZip
-RUN rm $GitVersionZip
+RUN unzip -d /usr/lib/GitVersion/ $GitVersionZip && rm $GitVersionZip
 WORKDIR /usr/lib/GitVersion/
 
 # Libgit2 can't resolve relative paths, patch to absolute path
@@ -16,4 +15,4 @@ RUN sed -i 's|lib/linux/x86_64|/usr/lib/GitVersion/lib/linux/x86_64|g' /usr/lib/
 RUN mkdir /repo
 VOLUME /repo
 
-ENTRYPOINT ["mono", "./GitVersion.exe", "/repo"]
\ No newline at end of file
+ENTRYPOINT ["mono", "./GitVersion.exe", "/repo"]
diff --git a/src/DockerBase/Dockerfile b/src/DockerBase/Dockerfile
index b6982b949b..5007f41f9d 100644
--- a/src/DockerBase/Dockerfile
+++ b/src/DockerBase/Dockerfile
@@ -1,13 +1,10 @@
-FROM ubuntu
+FROM ubuntu:16.04
 
 MAINTAINER GitTools Maintainers <jake@ginnivan.net>
 
 # Wheezy doesn't support glibc 2.15 which libgit2sharp requires
 # So we are going to install mono on ubuntu instead
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-RUN apt-get update
-RUN apt-get install libcurl3 tzdata unzip curl git-all -y
 RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
-RUN apt-get update
-RUN apt-get install mono-complete -y
+RUN apt-get update && apt-get install libcurl3 tzdata unzip curl git-all mono-complete -y && apt-get -yqq clean
 RUN cp /usr/share/zoneinfo/GMT /etc/localtime