diff --git a/Dockerfile b/Dockerfile
index 37efb1c0e..71136b3af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,5 @@
-FROM ubuntu:16.04
-MAINTAINER Mihail Fedorov <mit-license@fedorov.net>
-
-# All the stuff
-# And clean out packages, keep space minimal
-RUN apt-get -y update && \
-    apt-get -y upgrade && \
-    apt-get -y install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev \
-    unzip python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev \
-    protobuf-compiler libqt4-dev libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+FROM kolobus/ubuntu:komodo
+MAINTAINER Mihail Fedorov <tech@fedorov.net>
 
 ADD ./ /komodo
 ENV HOME /komodo
@@ -19,7 +9,7 @@ WORKDIR /komodo
 RUN cd /komodo && \
     ./autogen.sh && \
     ./configure --with-incompatible-bdb --with-gui || true && \
-    ./zcutil/build.sh -j4
+    ./zcutil/build.sh -j$(nproc)
 
 # Unknown stuff goes here
 
@@ -28,4 +18,3 @@ RUN ln -sf /komodo/src/komodod /usr/bin/komodod && \
     ln -sf /komodo/zcutil/docker-komodo-cli.sh /usr/bin/komodo-cli
 
 CMD ["entrypoint"]
-