diff --git a/build/build_one.sh b/build/build_one.sh
index 0904a92c..f6870794 100755
--- a/build/build_one.sh
+++ b/build/build_one.sh
@@ -50,7 +50,7 @@ fi
 mkdir -p "$context_dir"
 
 CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH go build -trimpath -o "$context_dir/$BIN" "${extra_args[@]}" "$PKG"
-if [ "$VERSION" != dev ] && [ "$ARCH" != s390x ]; then
+if [ "$VERSION" != dev ] && [ "$ARCH" = amd64 ]; then
   upx-ucl "$context_dir/$BIN"
 fi
 
diff --git a/release/chart.sh b/release/chart.sh
index 3f4a844e..ec917c04 100755
--- a/release/chart.sh
+++ b/release/chart.sh
@@ -17,12 +17,14 @@
 
 set -euo pipefail
 
+# delete any leftover packaged charts
+# (otherwise dates in index for their versions would be modified)
+rm -f _out/multicluster-scheduler-*.tgz
+
 helm package charts/multicluster-scheduler -d _out
 curl -s https://charts.admiralty.io/index.yaml >_out/index_old.yaml
 helm repo index _out --merge _out/index_old.yaml --url https://charts.admiralty.io
 
-# TODO: revert datetime created override for old versions (submit GitHub issue)
-
 # release CRDs separately, esp. for `helm upgrade`
 cat charts/multicluster-scheduler/crds/* >_out/admiralty.crds.yaml
 
diff --git a/release/image.sh b/release/image.sh
index 26aa7123..55d223d2 100755
--- a/release/image.sh
+++ b/release/image.sh
@@ -19,6 +19,7 @@ set -euo pipefail
 
 # constants
 default_registry="quay.io/admiralty"
+default_archs="amd64 arm64 ppc64le s390x"
 
 # environment variables
 # required
@@ -26,7 +27,7 @@ IMG="${IMG}"
 VERSION="${VERSION}"
 # optional
 REGISTRY="${REGISTRY:-$default_registry}"
-ARCHS="${ARCHS:-amd64}"
+ARCHS="${ARCHS:-$default_archs}"
 
 read -ra archs <<<"$ARCHS"
 
diff --git a/release/images.sh b/release/images.sh
index 1da556c2..b8d01bf3 100755
--- a/release/images.sh
+++ b/release/images.sh
@@ -25,5 +25,5 @@ imgs=(
 )
 
 for img in "${imgs[@]}"; do
-  IMG="$img" ARCHS="amd64 arm64 ppc64le s390x" ./release/image.sh
+  IMG="$img" ./release/image.sh
 done