diff --git a/.travis/ingress-controller.sh b/.travis/ingress-controller.sh
index 0ac8a01b8..d32d840b4 100755
--- a/.travis/ingress-controller.sh
+++ b/.travis/ingress-controller.sh
@@ -20,10 +20,10 @@ source $DIR/common.sh
 
 IMAGE=$(make -s -C $DIR/../ image-info)
 
-if docker_tag_exists "aledbf/nginx-ingress-controller" $(echo $IMAGE | jq .tag); then
+if docker_tag_exists "kubernetes-ingress-controller/nginx-ingress-controller" $(echo $IMAGE | jq .tag); then
     echo "Image already published"
     exit 0
 fi
 
-echo "building aledbf/nginx-ingress-controller image..."
+echo "building kubernetes-ingress-controller/nginx-ingress-controller image..."
 make -C $DIR/../ release
diff --git a/.travis/nginx-slim.sh b/.travis/nginx-slim.sh
index fc8c6aad9..a4d809469 100755
--- a/.travis/nginx-slim.sh
+++ b/.travis/nginx-slim.sh
@@ -20,7 +20,7 @@ source $DIR/common.sh
 
 IMAGE=$(make -s -C $DIR/../images/nginx-slim image-info)
 
-if docker_tag_exists "aledbf/nginx-slim" $(echo $IMAGE | jq .tag); then
+if docker_tag_exists "kubernetes-ingress-controller/nginx-slim" $(echo $IMAGE | jq .tag); then
     echo "Image already published"
     exit 0
 fi
diff --git a/.travis/ubuntu-slim.sh b/.travis/ubuntu-slim.sh
index 82f1afe56..abd9b7855 100755
--- a/.travis/ubuntu-slim.sh
+++ b/.travis/ubuntu-slim.sh
@@ -20,7 +20,7 @@ source $DIR/common.sh
 
 IMAGE=$(make -s -C $DIR/../images/ubuntu-slim image-info)
 
-if docker_tag_exists "aledbf/ubuntu-slim" $(echo $IMAGE | jq .tag); then
+if docker_tag_exists "kubernetes-ingress-controller/ubuntu-slim" $(echo $IMAGE | jq .tag); then
     echo "Image already published"
     exit 0
 fi
diff --git a/Makefile b/Makefile
index 5a61a50d1..5fd8d2e15 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG?=0.9.0-beta.15
-REGISTRY?=quay.io/aledbf
+REGISTRY?=quay.io/kubernetes-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --
 SED_I?=sed -i
diff --git a/images/custom-error-pages/Makefile b/images/custom-error-pages/Makefile
index 96b3d3479..11be00530 100644
--- a/images/custom-error-pages/Makefile
+++ b/images/custom-error-pages/Makefile
@@ -4,7 +4,7 @@ BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG?=0.1
-REGISTRY?=aledbf
+REGISTRY?=quay.io/kubernetes-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --
 SED_I?=sed -i
@@ -47,9 +47,6 @@ ifeq ($(ARCH),ppc64le)
 	QEMUARCH=ppc64le
 	GOARCH=ppc64le
 endif
-#ifeq ($(ARCH),s390x)
-#        QEMUARCH=s390x
-#endif
 
 TEMP_DIR := $(shell mktemp -d)
 
diff --git a/images/nginx-slim/Makefile b/images/nginx-slim/Makefile
index 426c78dfd..ea4949858 100644
--- a/images/nginx-slim/Makefile
+++ b/images/nginx-slim/Makefile
@@ -14,7 +14,7 @@
 
 # 0.0.0 shouldn't clobber any released builds
 TAG ?= 0.27
-REGISTRY ?= quay.io/aledbf
+REGISTRY ?= quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 DOCKER ?= gcloud docker --
 
@@ -33,7 +33,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/aledbf/ubuntu-slim-$(ARCH):0.14
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/ubuntu-slim-$(ARCH):0.14
 
 ifeq ($(ARCH),arm)
         QEMUARCH=arm
diff --git a/images/ubuntu-slim/Makefile b/images/ubuntu-slim/Makefile
index 0568f28c2..22d0d5812 100755
--- a/images/ubuntu-slim/Makefile
+++ b/images/ubuntu-slim/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 TAG ?= 0.14
-REGISTRY = quay.io/aledbf
+REGISTRY = quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64 ppc64le
 
diff --git a/test/e2e/up.sh b/test/e2e/up.sh
index 70526316b..8bb9946ac 100755
--- a/test/e2e/up.sh
+++ b/test/e2e/up.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
+export JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
 
 echo "downloading kubectl..."
 curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl && \
@@ -50,12 +50,31 @@ kubectl set image \
     deployments \
     --namespace ingress-nginx \
 	--selector app=ingress-nginx \
-    nginx-ingress-controller=gcr.io/google_containers/nginx-ingress-controller:test
+    nginx-ingress-controller=quay.io/kubernetes-ingress-controller/nginx-ingress-controller:test
 
 sleep 5
 
 echo "waiting NGINX ingress pod..."
-until kubectl get pods -n ingress-nginx -l app=ingress-nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; 
-do
-    sleep 1;
-done
+
+function waitForPod() {
+    until kubectl get pods -n ingress-nginx -l app=ingress-nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True";
+    do
+        sleep 1;
+    done
+}
+
+export -f waitForPod
+
+timeout 10s bash -c waitForPod
+
+if kubectl get pods -n ingress-nginx -l app=ingress-nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True";
+then
+    echo "Kubernetes deployments started"
+else
+    echo "Kubernetes deployments with issues:"
+    kubectl get pods -n ingress-nginx
+
+    echo "Reason:"
+    kubectl describe pods -n ingress-nginx
+    exit 1
+fi