diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..38af8d6
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git/
+/vendor/
diff --git a/Dockerfile b/Dockerfile
index 7e38d28..ad64b84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,17 +5,15 @@ FROM golang:1.11-alpine as builder
 RUN apk add --update git make bash
 RUN go get -u github.com/golang/dep/cmd/dep
 
-# Get sources
+# Get dependencies
 
-RUN go get github.com/bloomberg/goldpinger/cmd/goldpinger
 WORKDIR /go/src/github.com/bloomberg/goldpinger
-
-# Install our dependencies
-
+COPY Gopkg.toml Gopkg.lock Makefile ./
 RUN make vendor
 
 # Build goldpinger
 
+COPY . ./
 RUN make bin/goldpinger
 
 # Build the asset container, copy over goldpinger
diff --git a/Makefile b/Makefile
index f7176f5..fcccbdc 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ clean:
 
 vendor:
 	rm -rf ./vendor
-	dep ensure -v
+	dep ensure -v -vendor-only
 
 swagger:
 	swagger generate server -t pkg -f ./swagger.yml --exclude-main -A goldpinger && \