diff --git a/Dockerfile b/Dockerfile
index 5bdb552..dd797bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 ARG IMG_TAG=1
-FROM golang:${IMG_TAG}
+FROM golang:${IMG_TAG} as builder
 RUN go get -u github.com/go-bindata/go-bindata/... \
-  && go get -u github.com/go-swagger/go-swagger/... \
-  && mv "$(go env GOPATH)/bin/go-bindata" /usr/bin \
-  && mv "$(go env GOPATH)/bin/swagger" /usr/bin
+  && go get -u github.com/go-swagger/go-swagger/...
 
+FROM golang:${IMG_TAG}
+COPY --from=builder /go/bin/swagger /usr/bin
+COPY --from=builder /go/bin/go-bindata /usr/bin