diff --git a/workspaces/backend/Makefile b/workspaces/backend/Makefile
index ed264a7ad..838996ed9 100644
--- a/workspaces/backend/Makefile
+++ b/workspaces/backend/Makefile
@@ -104,7 +104,7 @@ docker-push: ## Push docker image with the backend.
 # - have enabled BuildKit. More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 # - be able to push the image to your registry (i.e. if you do not set a valid value via IMG=<myregistry/image:<tag>> then the export will fail)
 # To adequately provide solutions that are compatible with multiple platforms, you should consider using this option.
-PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+PLATFORMS ?= linux/arm64/v8,linux/amd64,linux/ppc64le
 .PHONY: docker-buildx
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
diff --git a/workspaces/controller/Makefile b/workspaces/controller/Makefile
index 6032c8c91..64d6b99ed 100644
--- a/workspaces/controller/Makefile
+++ b/workspaces/controller/Makefile
@@ -114,7 +114,7 @@ docker-push: ## Push docker image with the manager.
 # - have enabled BuildKit. More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 # - be able to push the image to your registry (i.e. if you do not set a valid value via IMG=<myregistry/image:<tag>> then the export will fail)
 # To adequately provide solutions that are compatible with multiple platforms, you should consider using this option.
-PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+PLATFORMS ?= linux/arm64/v8,linux/amd64,linux/ppc64le
 .PHONY: docker-buildx
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
diff --git a/workspaces/frontend/Makefile b/workspaces/frontend/Makefile
index a7758ae50..cc5ef28de 100755
--- a/workspaces/frontend/Makefile
+++ b/workspaces/frontend/Makefile
@@ -39,7 +39,7 @@ docker-push: ## Push docker image for the frontend.
 	$(CONTAINER_TOOL) push ${IMG}
 
 # PLATFORMS defines the target platforms for cross-platform support.
-PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+PLATFORMS ?= linux/arm64/v8,linux/amd64,linux/ppc64le
 
 .PHONY: docker-buildx
 docker-buildx: ## Build and push docker image for cross-platform support.