diff --git a/Dockerfile-builder b/Dockerfile-builder
deleted file mode 100644
index 3ca1303c14..0000000000
--- a/Dockerfile-builder
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM golang:1.6
-
-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
diff --git a/go-docker b/go-docker
index 3a77764d10..42c601294e 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/dex-builder:1.4 $@
+docker run $LINKS_STR $ENV_STR --rm -v `pwd`:/go/src/$REPO -w /go/src/$REPO -t golang:1.6.2 $@