diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4fac398
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+version.go
+vendor/
+tags
diff --git a/Dockerfile b/Dockerfile
index 9745b23..3212a06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,11 +13,17 @@ RUN set -x \
     upx \
   && update-ca-certificates
 
-ADD . /go/src/github.com/9seconds/mtg
+COPY Gopkg.toml Gopkg.lock Makefile /go/src/github.com/9seconds/mtg/
+
+RUN set -x && \
+  cd /go/src/github.com/9seconds/mtg && \
+  make -j 4 prepare && \
+  make vendor
+
+COPY . /go/src/github.com/9seconds/mtg
 
 RUN set -x \
   && cd /go/src/github.com/9seconds/mtg \
-  && make clean \
   && make -j 4 static \
   && upx --ultra-brute -qq ./mtg
 
diff --git a/Makefile b/Makefile
index 04a7219..22b918c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ ccbuilds:
 version.go:
 	@go generate main.go
 
-vendor: Gopkg.lock Gopkg.toml install-dep
-	@dep ensure
+vendor: Gopkg.lock Gopkg.toml
+	@dep ensure --vendor-only
 
 # -----------------------------------------------------------------------------