diff --git a/test/images/agnhost/BASEIMAGE b/test/images/agnhost/BASEIMAGE
index cc7c45a7657..1abb3804784 100644
--- a/test/images/agnhost/BASEIMAGE
+++ b/test/images/agnhost/BASEIMAGE
@@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.6
 windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809
 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
+windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
diff --git a/test/images/busybox/BASEIMAGE b/test/images/busybox/BASEIMAGE
index 25a8a313cad..87d9d142309 100644
--- a/test/images/busybox/BASEIMAGE
+++ b/test/images/busybox/BASEIMAGE
@@ -1,3 +1,4 @@
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
+windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE
index 82c59fd2470..8e3021fc673 100644
--- a/test/images/echoserver/BASEIMAGE
+++ b/test/images/echoserver/BASEIMAGE
@@ -6,3 +6,4 @@ linux/s390x=s390x/nginx:1.15-alpine
 windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809
 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
+windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE
index 704e84e512b..39d69011c61 100644
--- a/test/images/jessie-dnsutils/BASEIMAGE
+++ b/test/images/jessie-dnsutils/BASEIMAGE
@@ -6,3 +6,4 @@ linux/s390x=s390x/debian:jessie
 windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809
 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
+windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE
index 9d00181552a..bcb87adefb4 100644
--- a/test/images/kitten/BASEIMAGE
+++ b/test/images/kitten/BASEIMAGE
@@ -1,8 +1,9 @@
-linux/amd64=REGISTRY/agnhost:2.21-linux-amd64
-linux/arm=REGISTRY/agnhost:2.21-linux-arm
-linux/arm64=REGISTRY/agnhost:2.21-linux-arm64
-linux/ppc64le=REGISTRY/agnhost:2.21-linux-ppc64le
-linux/s390x=REGISTRY/agnhost:2.21-linux-s390x
-windows/amd64/1809=REGISTRY/agnhost:2.21-windows-amd64-1809
-windows/amd64/1903=REGISTRY/agnhost:2.21-windows-amd64-1903
-windows/amd64/1909=REGISTRY/agnhost:2.21-windows-amd64-1909
+linux/amd64=REGISTRY/agnhost:2.25-linux-amd64
+linux/arm=REGISTRY/agnhost:2.25-linux-arm
+linux/arm64=REGISTRY/agnhost:2.25-linux-arm64
+linux/ppc64le=REGISTRY/agnhost:2.25-linux-ppc64le
+linux/s390x=REGISTRY/agnhost:2.25-linux-s390x
+windows/amd64/1809=REGISTRY/agnhost:2.25-windows-amd64-1809
+windows/amd64/1903=REGISTRY/agnhost:2.25-windows-amd64-1903
+windows/amd64/1909=REGISTRY/agnhost:2.25-windows-amd64-1909
+windows/amd64/2004=REGISTRY/agnhost:2.25-windows-amd64-2004
diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE
index 9d00181552a..bcb87adefb4 100644
--- a/test/images/nautilus/BASEIMAGE
+++ b/test/images/nautilus/BASEIMAGE
@@ -1,8 +1,9 @@
-linux/amd64=REGISTRY/agnhost:2.21-linux-amd64
-linux/arm=REGISTRY/agnhost:2.21-linux-arm
-linux/arm64=REGISTRY/agnhost:2.21-linux-arm64
-linux/ppc64le=REGISTRY/agnhost:2.21-linux-ppc64le
-linux/s390x=REGISTRY/agnhost:2.21-linux-s390x
-windows/amd64/1809=REGISTRY/agnhost:2.21-windows-amd64-1809
-windows/amd64/1903=REGISTRY/agnhost:2.21-windows-amd64-1903
-windows/amd64/1909=REGISTRY/agnhost:2.21-windows-amd64-1909
+linux/amd64=REGISTRY/agnhost:2.25-linux-amd64
+linux/arm=REGISTRY/agnhost:2.25-linux-arm
+linux/arm64=REGISTRY/agnhost:2.25-linux-arm64
+linux/ppc64le=REGISTRY/agnhost:2.25-linux-ppc64le
+linux/s390x=REGISTRY/agnhost:2.25-linux-s390x
+windows/amd64/1809=REGISTRY/agnhost:2.25-windows-amd64-1809
+windows/amd64/1903=REGISTRY/agnhost:2.25-windows-amd64-1903
+windows/amd64/1909=REGISTRY/agnhost:2.25-windows-amd64-1909
+windows/amd64/2004=REGISTRY/agnhost:2.25-windows-amd64-2004
diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE
index d21f5f08ac3..3c5a77983f0 100644
--- a/test/images/nonroot/BASEIMAGE
+++ b/test/images/nonroot/BASEIMAGE
@@ -6,3 +6,4 @@ linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
+windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE
index cc7c45a7657..1abb3804784 100644
--- a/test/images/redis/BASEIMAGE
+++ b/test/images/redis/BASEIMAGE
@@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.6
 windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809
 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
+windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE
index 08ae26e3512..1cd8a3316e8 100644
--- a/test/images/sample-apiserver/BASEIMAGE
+++ b/test/images/sample-apiserver/BASEIMAGE
@@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.8
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
+windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004