diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88b9193f75f..d9f207a06d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,38 +1,37 @@
 stages:
+  - builder
   - build
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-#  NEXUS_USER:
-#  NEXUS_PASSWORD:
-#  NEXUS_HOST:
 builder:
   stage: builder
   when: manual
   services:
     - docker:dind
-  before_script:
+  script:
     - docker info
     - apk add --no-cache git curl binutils ca-certificates
     - docker login -u gitlab -p nopasswd $CI_REGISTRY
     - docker build -t yandex/clickhouse-builder ./docker/builder
-  script:
     - docker tag yandex/clickhouse-builder $CI_REGISTRY/yandex/clickhouse-builder
     - docker push $CI_REGISTRY/yandex/clickhouse-builder
   tags:
     - docker
 build:
   stage: build
+  when: manual
   services:
     - docker:dind
-  before_script:
-    - cd ./docker/builder
-    - docker info
-    - docker build -t yandex/clickhouse-builder .
   script:
+    - apk add --no-cache git curl binutils ca-certificates
+    - git submodule sync --recursive
+    - git submodule update --init --recursive
+    - docker info
+    - docker login -u gitlab -p nopasswd $CI_REGISTRY
+    - docker pull $CI_REGISTRY/yandex/clickhouse-builder
     - docker run --rm --volumes-from "${HOSTNAME}-build" --workdir "${CI_PROJECT_DIR}" --env CI_PROJECT_DIR=${CI_PROJECT_DIR} $CI_REGISTRY/yandex/clickhouse-builder /build_gitlab_ci.sh
-#  # You can upload your binary to nexus
-#  after_script:
-#    - curl -v --keepalive-time 60 --keepalive --user "$NEXUS_USER:$NEXUS_PASSWORD" -XPUT "http://$NEXUS_HOST/repository/binaries/$CI_PROJECT_NAME" --upload-file ./dbms/src/Server/clickhouse
+  # You can upload your binary to nexus
+    - curl -v --keepalive-time 60 --keepalive --user "$NEXUS_USER:$NEXUS_PASSWORD" -XPUT "http://$NEXUS_HOST/repository/binaries/$CI_PROJECT_NAME" --upload-file ./dbms/src/Server/clickhouse
   # Or download artifacts from gitlab
   artifacts:
     paths:
diff --git a/docker/builder/Makefile b/docker/builder/Makefile
index ef9b7fac5b6..b02d86373f2 100644
--- a/docker/builder/Makefile
+++ b/docker/builder/Makefile
@@ -1,5 +1,5 @@
 build:
-	docker run --rm -v $(realpath ../..):/server -it yandex/clickhouse-builder
+	docker run --rm --workdir /server -v $(realpath ../..):/server -it yandex/clickhouse-builder
 
 pull:
 	docker pull yandex/clickhouse-builder
diff --git a/docker/builder/build.sh b/docker/builder/build.sh
index a270d6029d2..52a63d278c0 100644
--- a/docker/builder/build.sh
+++ b/docker/builder/build.sh
@@ -5,7 +5,5 @@ export CC=gcc-7
 export CXX=g++-7
 
 mkdir -p /server/build
-cd /server/build
-
 cmake /server
 make -j $THREADS