diff --git a/Dockerfile b/Dockerfile
index fe9ba76..0775f0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,12 @@
-FROM golang
+FROM golang:1.7
 MAINTAINER Remco Verhoef <remco@dutchcoders.io>
 
-RUN mkdir -p /go/src/app
-WORKDIR /go/src/app
-
 # Copy the local package files to the container's workspace.
-ADD ./transfersh-server /go/src/app
-
-# install dependencies
-RUN go get ./
+ADD . /go/src/github.com/dutchcoders/transfer.sh
 
 # build & install server
-RUN go install . 
+RUN go build -o /go/bin/transfersh github.com/dutchcoders/transfer.sh
 
-ENTRYPOINT ["/go/bin/app", "--port", "8080"]  
+ENTRYPOINT ["/go/bin/transfersh", "--listener", ":8080", "--provider", "s3"]  
 
-EXPOSE 8080 6060
+EXPOSE 8080 8080