diff --git a/nim-base/Dockerfile b/nim-base/Dockerfile
index 8a916ce..4cf9778 100644
--- a/nim-base/Dockerfile
+++ b/nim-base/Dockerfile
@@ -3,20 +3,12 @@ MAINTAINER Yuriy Glukhov <iurii@status.im>
 ENV PATH $PATH:/nim/bin:/root/.nimble/bin
 RUN git clone https://github.com/status-im/nim.git \
     && cd nim \
-    && git config --global user.email "you@example.com" \
-    && git config --global user.name "Your Name" \
-    && git clone --depth 1 https://github.com/nim-lang/csources.git \
-    && cd csources \
-    && sh build.sh \
-    && cd .. \
-    && nim c koch \
-    && ./koch boot -d:release \
-    && ./koch nimble \
+    && sh build_all.sh \
     && echo echo nim version: $(git rev-parse HEAD) > /onStart.d/005-nim-version.sh \
     && chmod +x /onStart.d/005-nim-version.sh \
     && cd ./dist/nimble \
     && echo echo nimble version: $(git rev-parse HEAD) > /onStart.d/006-nimble-version.sh \
     && chmod +x /onStart.d/006-nimble-version.sh \
     && cd ../.. \
-    && rm -rf ./nimcache ./compiler/nimcache ./csources ./dist ./.git \
+    && rm -rf $HOME/.cache/nim ./csources ./dist ./.git \
     && cd ..