diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 539568db..ea729bfc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,10 +18,13 @@ jobs:
         include:
           - image: "ubuntu-22.04-jammy-arm64v8"
             qemu-arch: "aarch64"
+            platform: "linux/arm64v8"
           - image: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
+            platform: "linux/ppc64le"
           - image: "ubuntu-24.04-noble-s390x"
             qemu-arch: "s390x"
+            platform: "linux/s390x"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/Makefile.sub b/Makefile.sub
index 317a2cdc..694ff4b1 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -9,7 +9,11 @@ TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TARGET):$(BRANCH), p
 build:
 	cp -r ../Pillow/depends .
 	cp test.sh depends
-	docker build -t $(IMAGENAME):$(BRANCH) --platform linux/ppc64le .
+	if [ -n "$PLATFORM" ]; then
+        docker build -t $(IMAGENAME):$(BRANCH) --platform $PLATFORM .
+	else
+        docker build -t $(IMAGENAME):$(BRANCH) .
+	fi
 
 .PHONY: update
 update:
diff --git a/ubuntu-22.04-jammy-arm64v8/update.sh b/ubuntu-22.04-jammy-arm64v8/update.sh
index 9b053176..c7469241 100755
--- a/ubuntu-22.04-jammy-arm64v8/update.sh
+++ b/ubuntu-22.04-jammy-arm64v8/update.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker pull --platform linux/arm64v8 arm64v8/ubuntu:jammy
+docker pull --platform $PLATFORM arm64v8/ubuntu:jammy
diff --git a/ubuntu-24.04-noble-ppc64le/update.sh b/ubuntu-24.04-noble-ppc64le/update.sh
index 67b3be16..d2f89f80 100755
--- a/ubuntu-24.04-noble-ppc64le/update.sh
+++ b/ubuntu-24.04-noble-ppc64le/update.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker pull --platform linux/ppc64le ppc64le/ubuntu:noble
+docker pull --platform $PLATFORM ppc64le/ubuntu:noble
diff --git a/ubuntu-24.04-noble-s390x/update.sh b/ubuntu-24.04-noble-s390x/update.sh
index 0e4b849d..7c624ba4 100755
--- a/ubuntu-24.04-noble-s390x/update.sh
+++ b/ubuntu-24.04-noble-s390x/update.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker pull  --platform linux/s390x s390x/ubuntu:noble
+docker pull --platform $PLATFORM s390x/ubuntu:noble