diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index 813dfc9187..ce643e4b7d 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -189,7 +189,7 @@ jobs:
     if: |
       (github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.nginx == 'true')
     env:
-      PLATFORMS: linux/amd64,linux/arm,linux/arm64,linux/s390x
+      PLATFORMS: linux/amd64,linux/arm,linux/arm64
     steps:
       - name: Checkout
         uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
diff --git a/Makefile b/Makefile
index 033577e144..1c35c12b23 100644
--- a/Makefile
+++ b/Makefile
@@ -240,8 +240,8 @@ ensure-buildx:
 show-version:
 	echo -n $(TAG)
 
-PLATFORMS ?= amd64 arm arm64 s390x
-BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64,linux/s390x
+PLATFORMS ?= amd64 arm arm64
+BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64
 
 .PHONY: release # Build a multi-arch docker image
 release: ensure-buildx clean
diff --git a/hack/init-buildx.sh b/hack/init-buildx.sh
index 1a47bf145e..bac68e1ae1 100755
--- a/hack/init-buildx.sh
+++ b/hack/init-buildx.sh
@@ -42,12 +42,11 @@ fi
 # We can skip setup if the current builder already has multi-arch
 # AND if it isn't the docker driver, which doesn't work
 current_builder="$(docker buildx inspect)"
-# linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6
+# linux/amd64, linux/arm, linux/arm64
 if ! grep -q "^Driver: docker$"  <<<"${current_builder}" && \
      grep -q "linux/amd64" <<<"${current_builder}" && \
      grep -q "linux/arm"   <<<"${current_builder}" && \
-     grep -q "linux/arm64" <<<"${current_builder}" && \
-     grep -q "linux/s390x" <<<"${current_builder}"; then
+     grep -q "linux/arm64" <<<"${current_builder}"; then
   exit 0
 fi
 
diff --git a/images/Makefile b/images/Makefile
index 990d772310..31560168d3 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -41,7 +41,7 @@ EXTRAARGS ?= $(shell cat $(NAME)/EXTRAARGS)
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 # build with buildx
-PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x
+PLATFORMS?=linux/amd64,linux/arm,linux/arm64
 OUTPUT=
 PROGRESS=plain
 
diff --git a/images/cfssl/TAG b/images/cfssl/TAG
index b18d46540b..132d7a7cb6 100644
--- a/images/cfssl/TAG
+++ b/images/cfssl/TAG
@@ -1 +1 @@
-v1.0.1
+v1.0.1-test
diff --git a/images/custom-error-pages/TAG b/images/custom-error-pages/TAG
index 570c796513..0ce6bfb227 100644
--- a/images/custom-error-pages/TAG
+++ b/images/custom-error-pages/TAG
@@ -1 +1 @@
-v1.0.2
+v1.0.2-test
diff --git a/images/e2e-test-echo/TAG b/images/e2e-test-echo/TAG
index 0ec25f7505..17cd59934c 100644
--- a/images/e2e-test-echo/TAG
+++ b/images/e2e-test-echo/TAG
@@ -1 +1 @@
-v1.0.0
+v1.0.0-test
diff --git a/images/fastcgi-helloserver/TAG b/images/fastcgi-helloserver/TAG
index 570c796513..0ce6bfb227 100644
--- a/images/fastcgi-helloserver/TAG
+++ b/images/fastcgi-helloserver/TAG
@@ -1 +1 @@
-v1.0.2
+v1.0.2-test
diff --git a/images/httpbun/TAG b/images/httpbun/TAG
index 570c796513..0ce6bfb227 100644
--- a/images/httpbun/TAG
+++ b/images/httpbun/TAG
@@ -1 +1 @@
-v1.0.2
+v1.0.2-test
diff --git a/images/kube-webhook-certgen/TAG b/images/kube-webhook-certgen/TAG
index 61919cdd8e..0435df3497 100644
--- a/images/kube-webhook-certgen/TAG
+++ b/images/kube-webhook-certgen/TAG
@@ -1 +1 @@
-v1.4.4
+v1.4.4-test
diff --git a/images/nginx/Makefile b/images/nginx/Makefile
index 103ba217f9..3ed502759a 100644
--- a/images/nginx/Makefile
+++ b/images/nginx/Makefile
@@ -32,7 +32,7 @@ IMAGE = $(REGISTRY)/nginx
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 # build with buildx
-PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x
+PLATFORMS?=linux/amd64,linux/arm,linux/arm64
 OUTPUT=
 PROGRESS=plain
 build: ensure-buildx
diff --git a/images/nginx/TAG b/images/nginx/TAG
index b82608c0bb..0ec3f5a4a9 100644
--- a/images/nginx/TAG
+++ b/images/nginx/TAG
@@ -1 +1 @@
-v0.1.0
+v0.1.0-test
diff --git a/images/opentelemetry/TAG b/images/opentelemetry/TAG
index 0ec25f7505..17cd59934c 100644
--- a/images/opentelemetry/TAG
+++ b/images/opentelemetry/TAG
@@ -1 +1 @@
-v1.0.0
+v1.0.0-test
diff --git a/images/test-runner/TAG b/images/test-runner/TAG
index 795460fcec..0123a0dbc7 100644
--- a/images/test-runner/TAG
+++ b/images/test-runner/TAG
@@ -1 +1 @@
-v1.1.0
+v1.1.0-test