diff --git a/Dockerfile b/Dockerfile
index bdfa1613d15edefcb28978ea8df7b7e42212dcaf..2524c758b9d22f92e26663dbbf4b2e7ef8fcb90d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,12 @@
-FROM golang:alpine as builder
+FROM golang:alpine as go_builder
+
 RUN apk add --no-cache curl git gcc musl-dev
 RUN curl https://glide.sh/get | sh
 
 WORKDIR /go/src/app
-COPY glide.lock glide.yaml ./
+COPY glide.* ./
 RUN glide install
-COPY . .
+COPY *.go ./
 RUN CGO_ENABLED=0 GOOS=linux go build -a app .
 
 FROM node:alpine as asset_builder
@@ -15,10 +16,10 @@ RUN npm install
 COPY assets /app/assets
 RUN npm run build
 
-FROM alpine
+FROM alpine:3.7
 WORKDIR /
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /go/src/app/app /app
+COPY --from=go_builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=go_builder /go/src/app/app /app
 COPY templates /templates
 COPY --from=asset_builder /app/assets /assets
 ENTRYPOINT ["/app"]
\ No newline at end of file