diff --git a/Dockerfile b/Dockerfile
index f041478..9f3a9db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,37 +1,24 @@
-ARG ALPINE_VERSION=3.8
-ARG GO_VERSION=1.11.4
+ARG BASE_IMAGE_BUILDER_GO=golang
+ARG BASE_IMAGE_BUILDER_NODE=alpine
+ARG ALPINE_VERSION=3.10
+ARG GO_VERSION=1.12.6
 ARG STACKEDIT_VERSION=v5.13.3
 
-FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder
+FROM ${BASE_IMAGE_BUILDER_GO}:${GO_VERSION}-alpine${ALPINE_VERSION} AS server
+ARG GOARCH=amd64
+ARG GOARM
+ARG BINCOMPRESS
 RUN apk --update add git build-base upx
 RUN go get -u -v golang.org/x/vgo
 WORKDIR /tmp/gobuild
+COPY go.mod go.sum ./
+RUN go mod download
+COPY *.go ./
+#RUN go test -v -race ./...
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} GOARM=${GOARM} go build -a -installsuffix cgo -ldflags="-s -w" -o app
+RUN [ "${BINCOMPRESS}" == "" ] || (upx -v --best --lzma --overlay=strip app && upx -t app)
 
-FROM scratch AS final
-ARG BUILD_DATE
-ARG VCS_REF
-ARG STACKEDIT_VERSION
-LABEL org.label-schema.schema-version="1.0.0-rc1" \
-      maintainer="quentin.mcgaw@gmail.com" \
-      org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/qdm12/stackedit-docker" \
-      org.label-schema.url="https://github.com/qdm12/stackedit-docker" \
-      org.label-schema.vcs-description="StackEdit server in a lightweight Docker container" \
-      org.label-schema.vcs-usage="https://github.com/qdm12/stackedit-docker/blob/master/README.md#setup" \
-      org.label-schema.docker.cmd="docker run -d -p 8000:8000/tcp qmcgaw/stackedit" \
-      org.label-schema.docker.cmd.devel="docker run -it --rm -p 8000:8000/tcp qmcgaw/stackedit" \
-      org.label-schema.docker.params="" \
-      org.label-schema.version=$STACKEDIT_VERSION \
-      image-size="29.3MB" \
-      ram-usage="7MB" \
-      cpu-usage="Very low"
-EXPOSE 8000
-HEALTHCHECK --start-period=1s --interval=100s --timeout=2s --retries=1 CMD ["/server","healthcheck"]
-USER 1000
-ENTRYPOINT ["/server"]
-
-FROM alpine:${ALPINE_VERSION} AS stackedit
+FROM ${BASE_IMAGE_BUILDER_NODE}:${ALPINE_VERSION} AS stackedit
 ARG STACKEDIT_VERSION
 WORKDIR /stackedit
 RUN apk add -q --progress --update --no-cache git npm
@@ -42,14 +29,28 @@ RUN wget -q https://github.com/benweet/stackedit/archive/${STACKEDIT_VERSION}.ta
 RUN npm install
 RUN npm run build
 
-FROM builder AS server
-COPY go.mod go.sum ./
-RUN go mod download
-COPY *.go ./
-#RUN go test -v -race ./...
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -ldflags="-s -w" -o app .
-RUN [ "${BINCOMPRESS}" == "" ] || (upx -v --best --lzma --overlay=strip app && upx -t app)
-
-FROM final
+FROM scratch AS final
+ARG BUILD_DATE
+ARG VCS_REF
+ARG STACKEDIT_VERSION
+LABEL org.label-schema.schema-version="1.0.0-rc1" \
+    maintainer="quentin.mcgaw@gmail.com" \
+    org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url="https://github.com/qdm12/stackedit-docker" \
+    org.label-schema.url="https://github.com/qdm12/stackedit-docker" \
+    org.label-schema.vcs-description="StackEdit server in a lightweight Docker container" \
+    org.label-schema.vcs-usage="https://github.com/qdm12/stackedit-docker/blob/master/README.md#setup" \
+    org.label-schema.docker.cmd="docker run -d -p 8000:8000/tcp qmcgaw/stackedit" \
+    org.label-schema.docker.cmd.devel="docker run -it --rm -p 8000:8000/tcp qmcgaw/stackedit" \
+    org.label-schema.docker.params="" \
+    org.label-schema.version=$STACKEDIT_VERSION \
+    image-size="29.3MB" \
+    ram-usage="7MB" \
+    cpu-usage="Very low"
+EXPOSE 8000
+HEALTHCHECK --start-period=1s --interval=100s --timeout=2s --retries=1 CMD ["/server","healthcheck"]
+USER 1000
+ENTRYPOINT ["/server"]
 COPY --from=stackedit --chown=1000 /stackedit/dist /html
 COPY --from=server --chown=1000 /tmp/gobuild/app /server