diff --git a/Dockerfile b/Dockerfile
index 2feb314ac9aa3abe5e925d0d1cfb80ad313976f8..8f58401a3823fefbcc0924b0c350f9e02d763317 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,8 @@ RUN apk add --no-cache curl git gcc musl-dev
 RUN curl https://glide.sh/get | sh
 
 WORKDIR /go/src/app
-COPY . .
+COPY *.go .
+COPY glide.* .
 RUN glide install
 RUN CGO_ENABLED=false go build -a app .
 
@@ -18,6 +19,6 @@ RUN npm run build
 FROM alpine:3.7
 WORKDIR /
 COPY --from=go_builder /go/src/app/app /app
-COPY --from=go_builder /go/src/app/templates /templates
+COPY templates /templates
 COPY --from=asset_builder /app/assets /assets
-CMD ["/app"]
\ No newline at end of file
+ENTRYPOINT ["/app"]
\ No newline at end of file