diff --git a/test/e2e/apiserver.go b/test/e2e/apiserver.go
index b657b3b162..69ab33d5b4 100644
--- a/test/e2e/apiserver.go
+++ b/test/e2e/apiserver.go
@@ -39,24 +39,27 @@ import (
 )
 
 const (
-	compliantImage1     = "registry.opensource.zalan.do/teapot/skipper:v0.14.0" // these are several compliant images
-	compliantImage2     = "registry.opensource.zalan.do/teapot/skipper:v0.14.1"
-	compliantImage3     = "registry.opensource.zalan.do/teapot/skipper:v0.14.2"
-	compliantImage4     = "registry.opensource.zalan.do/teapot/skipper:v0.14.3"
-	compliantImage5     = "registry.opensource.zalan.do/teapot/skipper:v0.14.4"
-	compliantImage6     = "registry.opensource.zalan.do/teapot/skipper:v0.14.5"
-	compliantImage7     = "registry.opensource.zalan.do/teapot/skipper:v0.14.6"
-	compliantImage8     = "registry.opensource.zalan.do/teapot/skipper:v0.14.7"
-	nonCompliantImage1  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-2" // these are several non-compliant images
-	nonCompliantImage2  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-3"
-	nonCompliantImage3  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-5"
-	nonCompliantImage4  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-6"
-	nonCompliantImage5  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-7"
-	nonCompliantImage6  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-8"
-	nonCompliantImage7  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-10"
-	nonCompliantImage8  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-11"
-	nonCompliantImage9  = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-12"
-	nonCompliantImage10 = "registry.opensource.zalan.do/teapot/skipper-test:pr-2080-13"
+	// these are several compliant images
+	compliantImage1 = "container-registry.zalando.net/teapot/skipper:v0.21.0"
+	compliantImage2 = "container-registry.zalando.net/teapot/skipper:v0.21.1"
+	compliantImage3 = "container-registry.zalando.net/teapot/skipper:v0.21.2"
+	compliantImage4 = "container-registry.zalando.net/teapot/skipper:v0.21.3"
+	compliantImage5 = "container-registry.zalando.net/teapot/skipper:v0.21.4"
+	compliantImage6 = "container-registry.zalando.net/teapot/skipper:v0.21.5"
+	compliantImage7 = "container-registry.zalando.net/teapot/skipper:v0.21.6"
+	compliantImage8 = "container-registry.zalando.net/teapot/skipper:v0.21.7"
+
+	// these are non-compliant because of expired base image
+	nonCompliantImage1  = "container-registry.zalando.net/teapot/skipper:v0.16.0"
+	nonCompliantImage2  = "container-registry.zalando.net/teapot/skipper:v0.16.1"
+	nonCompliantImage3  = "container-registry.zalando.net/teapot/skipper:v0.16.2"
+	nonCompliantImage4  = "container-registry.zalando.net/teapot/skipper:v0.16.3"
+	nonCompliantImage5  = "container-registry.zalando.net/teapot/skipper:v0.16.4"
+	nonCompliantImage6  = "container-registry.zalando.net/teapot/skipper:v0.16.5"
+	nonCompliantImage7  = "container-registry.zalando.net/teapot/skipper:v0.16.6"
+	nonCompliantImage8  = "container-registry.zalando.net/teapot/skipper:v0.16.7"
+	nonCompliantImage9  = "container-registry.zalando.net/teapot/skipper:v0.16.8"
+	nonCompliantImage10 = "container-registry.zalando.net/teapot/skipper:v0.16.9"
 	waitForPodTimeout   = 5 * time.Minute
 )