diff --git a/Makefile b/Makefile
index a85cac2dc..e4f3f0b19 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ GOBUILD_FLAGS :=
 
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 
-QEMUVERSION = v2.12.0
+QEMUVERSION = v2.12.0-1
 
 BUSTED_ARGS =-v --pattern=_test
 
@@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.57
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.58
 
 ifeq ($(ARCH),arm)
 	QEMUARCH=arm
diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh
index 2dadf44a2..162dbd29c 100755
--- a/build/go-in-docker.sh
+++ b/build/go-in-docker.sh
@@ -40,7 +40,7 @@ if [ "$missing" = true ];then
   exit 1
 fi
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08042018-e2f5d90
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08152018-56ed290
 
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/images/custom-error-pages/Makefile b/images/custom-error-pages/Makefile
index 0fd5f7328..a351ab1c5 100644
--- a/images/custom-error-pages/Makefile
+++ b/images/custom-error-pages/Makefile
@@ -30,7 +30,7 @@ BASEIMAGE?=alpine:3.7
 
 ALL_ARCH = amd64 arm arm64 ppc64le
 
-QEMUVERSION=v2.12.0
+QEMUVERSION=v2.12.0-1
 
 IMGNAME = custom-error-pages
 IMAGE = $(REGISTRY)/$(IMGNAME)
diff --git a/images/nginx/Makefile b/images/nginx/Makefile
index a0a3b2f27..da76ee856 100644
--- a/images/nginx/Makefile
+++ b/images/nginx/Makefile
@@ -26,7 +26,7 @@ ifeq ($(GOHOSTOS),darwin)
   SED_I=sed -i ''
 endif
 
-QEMUVERSION=v2.12.0
+QEMUVERSION=v2.12.0-1
 
 IMGNAME = nginx
 IMAGE = $(REGISTRY)/$(IMGNAME)