diff --git a/dockerbuild/Dockerfile.ubuntu-xenial b/dockerbuild/Dockerfile.ubuntu-xenial
index 4d371ca37..0798a44d3 100644
--- a/dockerbuild/Dockerfile.ubuntu-xenial
+++ b/dockerbuild/Dockerfile.ubuntu-xenial
@@ -7,10 +7,10 @@ RUN apt-get update && apt-get -y install build-essential curl ca-certificates de
 RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     tar -C /usr/local -xzf go.tar.gz && \
     rm go.tar.gz
-RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \
-    chmod +x cmake.sh && \
-    ./cmake.sh --skip-license --exclude-subdir && \
-    rm cmake.sh
+RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz
+WORKDIR /cmake-3.17.3
+RUN ./bootstrap && make -j8 && make install
+WORKDIR /
 
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
diff --git a/dockerbuild/Dockerfile.ubuntu-xenial-x64 b/dockerbuild/Dockerfile.ubuntu-xenial-x64
new file mode 100644
index 000000000..4d371ca37
--- /dev/null
+++ b/dockerbuild/Dockerfile.ubuntu-xenial-x64
@@ -0,0 +1,19 @@
+FROM ubuntu:xenial-20200114
+
+ARG go_pkg_url
+
+RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd
+
+RUN curl -s -k $go_pkg_url -o go.tar.gz && \
+    tar -C /usr/local -xzf go.tar.gz && \
+    rm go.tar.gz
+RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \
+    chmod +x cmake.sh && \
+    ./cmake.sh --skip-license --exclude-subdir && \
+    rm cmake.sh
+
+
+RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
+CMD ["/usr/bin/sshd", "-D"]
+