diff --git a/.gitignore b/.gitignore
index efb82050a..846d13822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ logs/*
 node_modules
 .idea
 dist
+dockerui
diff --git a/Dockerfile b/Dockerfile
index 31b680be2..576a93ed0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
-FROM crosbymichael/golang
+FROM scratch
+
+COPY dockerui /
+COPY dist /
 
-COPY dockerui.go /app/
-COPY dist/ /app/
-WORKDIR /app/
-RUN go build dockerui.go
 EXPOSE 9000
-ENTRYPOINT ["./dockerui"]
+ENTRYPOINT ["/dockerui"]
diff --git a/Makefile b/Makefile
index 05cad8499..44f4db07d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,15 @@ PORT ?= 9000
 
 install:
 	npm install -g grunt-cli
+	npm install
 
 build:
 	grunt build
 	docker build --rm -t dockerui .
 
 build-release:
-	grunt release
-	docker build --rm -t dockerui .
+	grunt build
+	docker run --rm -v $(pwd):/src centurylink/golang-builder
 
 test:
 	grunt
diff --git a/dockerui.go b/dockerui.go
index e0dfd3309..496308d30 100644
--- a/dockerui.go
+++ b/dockerui.go
@@ -1,4 +1,4 @@
-package main
+package main // import "github.com/crosbymichael/dockerui"
 
 import (
 	"flag"