diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml
index d97262f53..5ffd16233 100644
--- a/images/dvcr/werf.inc.yaml
+++ b/images/dvcr/werf.inc.yaml
@@ -1,15 +1,38 @@
 ---
-image: {{ $.ImageName }}-original-registry2
-final: false
-from: {{ .Images.BASE_CONTAINER_REGISTRY }}
----
 image: {{ $.ImageName }}
 from: {{ .Images.BASE_SCRATCH }}
 import:
-- image: {{ $.ImageName }}-original-registry2
-  add: /bin
+- image: {{ $.ImageName }}-builder
+  add: /container-registry-binary
   to: /bin
   after: install
-  includePaths:
-  - registry
-# Registry configuration is stored in configmap: templates/dvcr/configmap.yaml 
\ No newline at end of file
+# Registry configuration is stored in configmap: templates/dvcr/configmap.yaml 
+---
+{{- $version := "2.8.3" }}
+
+image: {{ $.ImageName }}-builder
+final: false
+fromImage: base-alt-p10
+shell:
+  install:
+    - |
+      apt-get update && apt-get install -y \
+      git openssh golang
+
+      export GOPATH=$(go env GOPATH)
+      export GOROOT=$(go env GOROOT)
+      export GO111MODULE=off
+      
+      mkdir -p /container-registry-binary
+      mkdir -p $GOPATH/src/github.com/docker
+
+      cd $GOPATH/src/github.com/docker
+      git clone --depth 1 --branch v{{ $version }} {{ $.SOURCE_REPO }}/docker/distribution.git
+      cd distribution
+
+      go build -o /container-registry-binary/ -ldflags '-s -w -X registry/version.Version=v{{ $version }} -X registry/version.Revision=v{{ $version }}' ./cmd/registry
+    - |
+      echo "Clean up"
+      apt-get clean
+      rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
+      rm -rf $(go env GOCACHE)