diff --git a/test/images/image-util.sh b/test/images/image-util.sh
index 2fabb902095..75bf7968a71 100755
--- a/test/images/image-util.sh
+++ b/test/images/image-util.sh
@@ -84,7 +84,7 @@ build() {
     TAG=$(<VERSION)
 
     if [[ -f BASEIMAGE ]]; then
-      BASEIMAGE=$(getBaseImage "${os_name}" "${arch}")
+      BASEIMAGE=$(getBaseImage "${os_name}" "${arch}" | ${SED} "s|REGISTRY|${REGISTRY}|g")
       ${SED} -i "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
       ${SED} -i "s|BASEARCH|${arch}|g" Dockerfile
     fi
diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE
index 810277dce76..fa30cda5081 100644
--- a/test/images/kitten/BASEIMAGE
+++ b/test/images/kitten/BASEIMAGE
@@ -1,5 +1,5 @@
-linux/amd64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-amd64:2.11
-linux/arm=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm:2.11
-linux/arm64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm64:2.11
-linux/ppc64le=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-ppc64le:2.11
-linux/s390x=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-s390x:2.11
+linux/amd64=REGISTRY/agnhost-amd64:2.11
+linux/arm=REGISTRY/agnhost-arm:2.11
+linux/arm64=REGISTRY/agnhost-arm64:2.11
+linux/ppc64le=REGISTRY/agnhost-ppc64le:2.11
+linux/s390x=REGISTRY/agnhost-s390x:2.11
diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE
index 810277dce76..fa30cda5081 100644
--- a/test/images/nautilus/BASEIMAGE
+++ b/test/images/nautilus/BASEIMAGE
@@ -1,5 +1,5 @@
-linux/amd64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-amd64:2.11
-linux/arm=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm:2.11
-linux/arm64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm64:2.11
-linux/ppc64le=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-ppc64le:2.11
-linux/s390x=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-s390x:2.11
+linux/amd64=REGISTRY/agnhost-amd64:2.11
+linux/arm=REGISTRY/agnhost-arm:2.11
+linux/arm64=REGISTRY/agnhost-arm64:2.11
+linux/ppc64le=REGISTRY/agnhost-ppc64le:2.11
+linux/s390x=REGISTRY/agnhost-s390x:2.11