diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index aac74884e..000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Dockerfile
-Makefile
-unsee
diff --git a/.dockerignore b/.dockerignore
new file mode 120000
index 000000000..3e4e48b0b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+.gitignore
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9bfb03c8f..cc4a73f46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,10 @@
-FROM golang:1.8.3-alpine
-
+FROM golang:1.8.3-alpine as unsee-builder
 COPY . /go/src/github.com/cloudflare/unsee
-
 ARG VERSION
+RUN apk add --update make git nodejs
+RUN make -C /go/src/github.com/cloudflare/unsee VERSION="${VERSION:-dev}"
 
-RUN go install \
-    -ldflags "-X main.version=${VERSION:-dev}" \
-    github.com/cloudflare/unsee && \
-    rm -fr /go/src
-
+FROM golang:1.8.3-alpine
+COPY --from=unsee-builder /go/src/github.com/cloudflare/unsee/unsee /bin/unsee
 EXPOSE 8080
-
 CMD ["unsee"]