diff --git a/Dockerfile b/Dockerfile
index 30363eae..881bb90d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,13 @@
 FROM golang:1.4
 
 ENV CONFIG_PATH /etc/docker/registry/config.yml
-RUN mkdir -pv "$(dirname $CONFIG_PATH)"
-
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
+ENV GOPATH $DISTRIBUTION_DIR/Godeps/_workspace:$GOPATH
+
 WORKDIR $DISTRIBUTION_DIR
 COPY . $DISTRIBUTION_DIR
-ENV GOPATH $GOPATH:$DISTRIBUTION_DIR/Godeps/_workspace
-
-RUN go install -v ./cmd/registry
-
+RUN make PREFIX=/go clean binaries
+RUN mkdir -pv "$(dirname $CONFIG_PATH)"
 RUN cp -lv ./cmd/registry/config.yml $CONFIG_PATH
 
 EXPOSE 5000