diff --git a/Dockerfile b/Dockerfile
index 0850c7d6c..71136b3af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM kolobus/komodod:ubuntu
-MAINTAINER Mihail Fedorov <mit-license@fedorov.net>
+FROM kolobus/ubuntu:komodo
+MAINTAINER Mihail Fedorov <tech@fedorov.net>
 
 ADD ./ /komodo
 ENV HOME /komodo
@@ -9,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