diff --git a/Dockerfile b/Dockerfile
index 3634846..e707ed3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,44 +1,41 @@
 # Build image
 FROM golang:1.14-alpine as build
 
 RUN apk add --update nodejs nodejs-npm make g++ git
 RUN npm install -g less less-plugin-clean-css
 RUN go get -u github.com/go-bindata/go-bindata/...
 
 RUN mkdir -p /go/src/github.com/writeas/writefreely
 WORKDIR /go/src/github.com/writeas/writefreely
 COPY . .
 
+# Build
 ENV GO111MODULE=on
-ENV softwareVer=docker
-#Build
-RUN go-bindata -pkg writefreely -ignore=\\.gitignore schema.sql sqlite.sql
-RUN go get -d -v ./...
-RUN go build -ldflags="-X github.com/writeas/writefreely.softwareVer=${softwareVer}" -v ./cmd/writefreely/
+RUN make build
 
 # UI
 RUN lessc ./less/app.less --clean-css="--s1 --advanced" ../static/css/write.css
 RUN lessc ./less/fonts.less --clean-css="--s1 --advanced" ../static/css/fonts.css
 RUN lessc ./less/icons.less --clean-css="--s1 --advanced" ../static/css/icons.css
 
 RUN mkdir /stage && \
     cp -R /go/bin \
       /go/src/github.com/writeas/writefreely/templates \
       /go/src/github.com/writeas/writefreely/static \
       /go/src/github.com/writeas/writefreely/pages \
       /go/src/github.com/writeas/writefreely/keys \
       /go/src/github.com/writeas/writefreely/cmd \
       /stage
 
 # Final image
 FROM alpine:3.12
 
 RUN apk add --no-cache openssl ca-certificates
 COPY --from=build --chown=daemon:daemon /stage /go
 
 WORKDIR /go
 VOLUME /go/keys
 EXPOSE 8080
 USER daemon
 
 ENTRYPOINT ["cmd/writefreely/writefreely"]