diff --git a/Dockerfile-builder b/Dockerfile-builder
new file mode 100644
index 00000000..8da5fc06
--- /dev/null
+++ b/Dockerfile-builder
@@ -0,0 +1,5 @@
+FROM golang:1.4
+
+RUN go get golang.org/x/tools/cmd/cover
+RUN go get golang.org/x/tools/cmd/vet
+RUN go get github.com/tools/godep
\ No newline at end of file
diff --git a/go-docker b/go-docker
index 84699a6a..3a77764d 100755
--- a/go-docker
+++ b/go-docker
@@ -23,4 +23,4 @@ for VAR in ${DOCKER_LINKS//,/ }; do
 done
 
 echo "running with docker, might take a while to pull the image..."
-docker run $LINKS_STR $ENV_STR --rm  -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/go-builder:1.3.3 $@
+docker run $LINKS_STR $ENV_STR --rm  -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/dex-builder:1.4 $@