diff --git a/Dockerfile b/Dockerfile
index 881bb90dd..24d187223 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,12 @@
 FROM golang:1.4
 
-ENV CONFIG_PATH /etc/docker/registry/config.yml
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV GOPATH $DISTRIBUTION_DIR/Godeps/_workspace:$GOPATH
 
 WORKDIR $DISTRIBUTION_DIR
 COPY . $DISTRIBUTION_DIR
 RUN make PREFIX=/go clean binaries
-RUN mkdir -pv "$(dirname $CONFIG_PATH)"
-RUN cp -lv ./cmd/registry/config.yml $CONFIG_PATH
 
 EXPOSE 5000
-CMD registry $CONFIG_PATH
+ENTRYPOINT ["registry"]
+CMD ["cmd/registry/config.yml"]