diff --git a/cluster-autoscaler/Makefile b/cluster-autoscaler/Makefile
index 672945a9b54d..3bdf51bba322 100644
--- a/cluster-autoscaler/Makefile
+++ b/cluster-autoscaler/Makefile
@@ -1,4 +1,4 @@
-ALL_ARCH = amd64 arm64 s390x
+ALL_ARCH = amd64 arm64
 all: $(addprefix build-arch-,$(ALL_ARCH))
 
 TAG?=dev
@@ -55,11 +55,11 @@ make-image: make-image-arch-$(GOARCH)
 make-image-arch-%:
 ifdef BASEIMAGE
 	docker build --pull --build-arg BASEIMAGE=${BASEIMAGE} \
-		-t ${IMAGE}-$*:${TAG} \
+		-t ${IMAGE}:${TAG}-$* \
 		-f Dockerfile.$* .
 else
 	docker build --pull \
-		-t ${IMAGE}-$*:${TAG} \
+		-t ${IMAGE}:${TAG}-$* \
 		-f Dockerfile.$* .
 endif
 	@echo "Image ${TAG}${FOR_PROVIDER}-$* completed"
@@ -67,11 +67,11 @@ endif
 push-image: push-image-arch-$(GOARCH)
 
 push-image-arch-%:
-	./push_image.sh ${IMAGE}-$*:${TAG}
+	./push_image.sh ${IMAGE}:${TAG}-$*
 
 push-manifest:
 	docker manifest create ${IMAGE}:${TAG} \
-	    $(addprefix $(REGISTRY)/cluster-autoscaler$(PROVIDER)-, $(addsuffix :$(TAG), $(ALL_ARCH)))
+	    $(addprefix $(REGISTRY)/cluster-autoscaler$(PROVIDER):$(TAG)-, $(ALL_ARCH))
 	docker manifest push --purge ${IMAGE}:${TAG}
 
 execute-release: $(addprefix make-image-arch-,$(ALL_ARCH)) $(addprefix push-image-arch-,$(ALL_ARCH)) push-manifest
diff --git a/cluster-autoscaler/push_image.sh b/cluster-autoscaler/push_image.sh
index 685a022ac46f..5b6acfa3afb0 100755
--- a/cluster-autoscaler/push_image.sh
+++ b/cluster-autoscaler/push_image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2017 The Kubernetes Authors.
 #
diff --git a/cluster-autoscaler/version/version.go b/cluster-autoscaler/version/version.go
index c37341078ec3..11d21711dc2d 100644
--- a/cluster-autoscaler/version/version.go
+++ b/cluster-autoscaler/version/version.go
@@ -17,4 +17,4 @@ limitations under the License.
 package version
 
 // ClusterAutoscalerVersion contains version of CA.
-const ClusterAutoscalerVersion = "1.31.0"
+const ClusterAutoscalerVersion = "1.31.0-hcloud1"