diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh
index 916d1d2604..75753c9a6c 100755
--- a/build/go-in-docker.sh
+++ b/build/go-in-docker.sh
@@ -40,9 +40,9 @@ if [ "$missing" = true ];then
   exit 1
 fi
 
-DOCKER_OPTS=${DOCKER_OPTS:-""}
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v07282018-45ba1672c
 
-docker build -t ingress-nginx:build build
+DOCKER_OPTS=${DOCKER_OPTS:-""}
 
 FLAGS=$@
 
@@ -74,6 +74,6 @@ docker run                                       \
     -v ${PWD}/bin/${ARCH}:/go/bin/linux_${ARCH}  \
     -w /go/src/${PKG}                            \
     --env-file .env                              \
-    ingress-nginx:build ${FLAGS}
+    ${E2E_IMAGE} ${FLAGS}
 
 rm .env
diff --git a/build/Dockerfile b/images/e2e/Dockerfile
similarity index 100%
rename from build/Dockerfile
rename to images/e2e/Dockerfile
diff --git a/images/e2e/Makefile b/images/e2e/Makefile
new file mode 100644
index 0000000000..8fb9e85660
--- /dev/null
+++ b/images/e2e/Makefile
@@ -0,0 +1,27 @@
+# Copyright 2018 The Kubernetes Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+TAG ?=v$(shell date +%m%d%Y)-$(shell git rev-parse --short HEAD)
+REGISTRY ?= quay.io/kubernetes-ingress-controller
+DOCKER ?= docker
+
+IMAGE = $(REGISTRY)/e2e
+
+all: docker-build docker-push
+
+docker-build:
+	$(DOCKER) build -t $(IMAGE):$(TAG) .
+
+docker-push:
+	$(DOCKER) push $(IMAGE):$(TAG)