diff --git a/Dockerfile b/Dockerfile
index 9e1f6b3..acb62b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,10 @@
-FROM busybox:latest
-ADD app /app
-CMD ["/app"]
+FROM golang:1 AS build-env
+RUN mkdir /app
+COPY . /app
+WORKDIR /app
+RUN CGO_ENABLED=0 go build -o /app/vault /app/main.go
+
+FROM alpine:latest
+COPY --from=build-env /app/vault /vault
+RUN ls -lah /vault
+CMD ["/vault"]
diff --git a/Makefile b/Makefile
index aa16fa1..f9bed7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 BINARY=vault
 VERSION=test
-CONTAINER_PORT=-p 7007:7014
-ENV=-e VAULT_APP_URL=vault.app
+VAULT_APP_URL="vault.app"
+HOST_PORT="8080"
+VAULT_PORT="8080"
 
 build:
-	docker run --rm -v ${PWD}:/go/src/app -w /go/src/app lrodham/golang-glide /bin/sh -c "glide install && go build"
 	docker build -t ${BINARY}:${VERSION} .
 start:
-	docker run ${ENV} -d ${CONTAINER_PORT} --name ${BINARY} ${BINARY}:${VERSION}
+	docker run -e VAULT_APP_URL=${APP_URL} -e VAULT_PORT=${VAULT_PORT} -d -p ${HOST_PORT}:${VAULT_PORT} --name ${BINARY} ${BINARY}:${VERSION}
 stop:
 	docker stop ${BINARY} && docker rm ${BINARY}