diff --git a/Dockerfile b/Dockerfile
index 2f9188b..4f924ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,9 +18,6 @@
 FROM golang:1.12 AS build-env
 SHELL ["/bin/bash", "-o",  "pipefail", "-c"]
 RUN /bin/true | cat
-RUN mkdir /app
-COPY . /app/
-WORKDIR /app
 ENV GO111MODULE=on
 ENV PROTOC_VERSION="3.7.0"
 ENV PROTOC_SHA256SUM="a1b8ed22d6dc53c5b8680a6f1760a305b33ef471bece482e92728f00ba2a2969"
@@ -29,18 +26,20 @@
 	gcc=4:8.3.0-1 \
 	curl=7.64.0-4 \
 	unzip=6.0-23+deb10u1
-
+RUN go get -u "google.golang.org/grpc" \
+    && go get "github.com/golang/protobuf/proto" \
+    && go get -v "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway" \
+    && go get -v "github.com/golang/protobuf/protoc-gen-go"
+RUN mkdir /app
+COPY . /app/
+WORKDIR /app
 RUN curl -L -o /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip 
 RUN mkdir /tmp/protoc3
 RUN   echo "$PROTOC_SHA256SUM  /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip" | sha256sum -c - \
  &&  unzip /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /tmp/protoc3 \
  && mv /tmp/protoc3/bin/* /usr/local/bin/ \
  && mv /tmp/protoc3/include/* /usr/local/include/
-RUN go get -u "google.golang.org/grpc" \
-    && go get "github.com/golang/protobuf/proto" \
-    && go get -v "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway" \
-    && go get -v "github.com/golang/protobuf/protoc-gen-go" \
-    &&  protoc -I proto -I"${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis" --go_out=plugins=grpc:proto/  proto/*.proto
+RUN protoc -I proto -I"${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis" --go_out=plugins=grpc:proto/  proto/*.proto
 RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -mod=vendor -o main .
 
 FROM alpine:3.9.4