diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index fca59b03b53d7..99db85e7c7a7f 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -80,7 +80,7 @@ jobs:
           IMAGE_PLATFORMS=linux/amd64
           if [[ "${{ github.event_name }}" == "push" || "${{ contains(github.event.pull_request.labels.*.name, 'test-arm-image') }}" == "true" ]]
           then
-            IMAGE_PLATFORMS=linux/amd64,linux/arm64
+            IMAGE_PLATFORMS=linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
           fi
           echo "Building image for platforms: $IMAGE_PLATFORMS"
           docker buildx build --platform $IMAGE_PLATFORMS --push="${{ github.event_name == 'push' }}" \
diff --git a/hack/install.sh b/hack/install.sh
index dcd629ad131bd..38d166087d251 100755
--- a/hack/install.sh
+++ b/hack/install.sh
@@ -10,6 +10,8 @@ ARCHITECTURE=""
 case $(uname -m) in
     x86_64)                     ARCHITECTURE="amd64" ;;
     arm64)                      ARCHITECTURE="arm64" ;;
+    ppc64le)                    ARCHITECTURE="ppc64le" ;;
+    s390x)                      ARCHITECTURE="s390x" ;;
     arm|armv7l|armv8l|aarch64)  dpkg --print-architecture | grep -q "arm64" && ARCHITECTURE="arm64" || ARCHITECTURE="arm" ;;
 esac
 
diff --git a/hack/installers/checksums/helm-v2.17.0-linux-ppc64le.tar.gz.sha256 b/hack/installers/checksums/helm-v2.17.0-linux-ppc64le.tar.gz.sha256
new file mode 100644
index 0000000000000..6e58379e6d9f0
--- /dev/null
+++ b/hack/installers/checksums/helm-v2.17.0-linux-ppc64le.tar.gz.sha256
@@ -0,0 +1 @@
+4e4df66130bb46ab4aa21e01b24f93276dbd6ee6cf4f03218a328f1a79f5cb34  helm-v2.17.0-linux-ppc64le.tar.gz
diff --git a/hack/installers/checksums/helm-v2.17.0-linux-s390x.tar.gz.sha256 b/hack/installers/checksums/helm-v2.17.0-linux-s390x.tar.gz.sha256
new file mode 100644
index 0000000000000..32e15a2fd3c90
--- /dev/null
+++ b/hack/installers/checksums/helm-v2.17.0-linux-s390x.tar.gz.sha256
@@ -0,0 +1 @@
+0a77b6e70a549a09f044ad8abc96eb125338d9e189749e9b97315cec6a519346  helm-v2.17.0-linux-s390x.tar.gz
diff --git a/hack/installers/checksums/helm-v3.8.0-linux-ppc64le.tar.gz.sha256 b/hack/installers/checksums/helm-v3.8.0-linux-ppc64le.tar.gz.sha256
new file mode 100644
index 0000000000000..cfb508e71cbe2
--- /dev/null
+++ b/hack/installers/checksums/helm-v3.8.0-linux-ppc64le.tar.gz.sha256
@@ -0,0 +1 @@
+5070fa5188e7bc798dd54bc1ea9fc4cda623d9ff45eedb05ec93db234309f391  helm-v3.8.0-linux-ppc64le.tar.gz
diff --git a/hack/installers/checksums/helm-v3.8.0-linux-s390x.tar.gz.sha256 b/hack/installers/checksums/helm-v3.8.0-linux-s390x.tar.gz.sha256
new file mode 100644
index 0000000000000..011cf89c6e987
--- /dev/null
+++ b/hack/installers/checksums/helm-v3.8.0-linux-s390x.tar.gz.sha256
@@ -0,0 +1 @@
+f8088ea57290fcc0aae50e2075c1adc258247cdf55169e9a9ca7762a64f558db  helm-v3.8.0-linux-s390x.tar.gz
diff --git a/hack/installers/checksums/helm-v3.8.1-linux-ppc64le.tar.gz.sha256 b/hack/installers/checksums/helm-v3.8.1-linux-ppc64le.tar.gz.sha256
new file mode 100644
index 0000000000000..816fb05ff954f
--- /dev/null
+++ b/hack/installers/checksums/helm-v3.8.1-linux-ppc64le.tar.gz.sha256
@@ -0,0 +1 @@
+7ab60a643fb7dd06f13209d85782623d817f3e8361b96e39b9949932f264ea86  helm-v3.8.1-linux-ppc64le.tar.gz
diff --git a/hack/installers/checksums/helm-v3.8.1-linux-s390x.tar.gz.sha256 b/hack/installers/checksums/helm-v3.8.1-linux-s390x.tar.gz.sha256
new file mode 100644
index 0000000000000..26a91f96a5682
--- /dev/null
+++ b/hack/installers/checksums/helm-v3.8.1-linux-s390x.tar.gz.sha256
@@ -0,0 +1 @@
+9eb564cdf4e5f4868c7abf790d4ac23ac2babc3f0c0eda7109259e21d43f8a83  helm-v3.8.1-linux-s390x.tar.gz
diff --git a/hack/installers/checksums/kubectl_ppc64le_1.17.8.sha256 b/hack/installers/checksums/kubectl_ppc64le_1.17.8.sha256
new file mode 100644
index 0000000000000..526a51c6adc46
--- /dev/null
+++ b/hack/installers/checksums/kubectl_ppc64le_1.17.8.sha256
@@ -0,0 +1 @@
+4600cc0103f8573fe326a3c80208cc8c948ba2b8b2855da2a242376ce855b9c9  kubectl_ppc64le_1.17.8
diff --git a/hack/installers/checksums/kubectl_s390x_1.17.8.sha256 b/hack/installers/checksums/kubectl_s390x_1.17.8.sha256
new file mode 100644
index 0000000000000..111becf0cc761
--- /dev/null
+++ b/hack/installers/checksums/kubectl_s390x_1.17.8.sha256
@@ -0,0 +1 @@
+bc409f75082a0d081cecef2287914ca9990b9c71d199e0cdcc052333a7bc4835  kubectl_s390x_1.17.8
diff --git a/hack/installers/checksums/kustomize_4.4.1_linux_ppc64le.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.4.1_linux_ppc64le.tar.gz.sha256
new file mode 100644
index 0000000000000..6949c124dda40
--- /dev/null
+++ b/hack/installers/checksums/kustomize_4.4.1_linux_ppc64le.tar.gz.sha256
@@ -0,0 +1 @@
+afa1747c21df0d5e5d7cf3f4ddaaeae0b51cfbb6724be2aa515030145daf7003  kustomize_4.4.1_linux_ppc64le.tar.gz
diff --git a/hack/installers/checksums/kustomize_4.4.1_linux_s390x.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.4.1_linux_s390x.tar.gz.sha256
new file mode 100644
index 0000000000000..645f962bd03ac
--- /dev/null
+++ b/hack/installers/checksums/kustomize_4.4.1_linux_s390x.tar.gz.sha256
@@ -0,0 +1 @@
+13bd9492d12c0591d6fcc0ee939e0e69c0aecd8648a6047f442e54eae5af6c80  kustomize_4.4.1_linux_s390x.tar.gz
diff --git a/hack/installers/checksums/protoc_3.17.3_linux_ppc64le.zip.sha256 b/hack/installers/checksums/protoc_3.17.3_linux_ppc64le.zip.sha256
new file mode 100644
index 0000000000000..ec876caa2f751
--- /dev/null
+++ b/hack/installers/checksums/protoc_3.17.3_linux_ppc64le.zip.sha256
@@ -0,0 +1 @@
+e8f34f40ab548c977cc434f27f6d64416d00d809d98d7da2ccd53c4fa8f9c450  protoc_3.17.3_linux_ppc64le.zip
diff --git a/hack/installers/checksums/protoc_3.17.3_linux_s390x.zip.sha256 b/hack/installers/checksums/protoc_3.17.3_linux_s390x.zip.sha256
new file mode 100644
index 0000000000000..1122ee8a5834d
--- /dev/null
+++ b/hack/installers/checksums/protoc_3.17.3_linux_s390x.zip.sha256
@@ -0,0 +1 @@
+1f6b42a88277ce779257e98a10d7b46241a69973d0ed28e58151da7e3085bb2e  protoc_3.17.3_linux_s390x.zip
diff --git a/hack/installers/install-codegen-tools.sh b/hack/installers/install-codegen-tools.sh
index 9d23dd8fb1355..eda5699259e77 100755
--- a/hack/installers/install-codegen-tools.sh
+++ b/hack/installers/install-codegen-tools.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -eux -o pipefail
 
-KUSTOMIZE_VERSION=4.2.0 "$(dirname $0)/../install.sh" kustomize protoc
+KUSTOMIZE_VERSION=4.4.1 "$(dirname $0)/../install.sh" kustomize protoc
diff --git a/hack/installers/install-kustomize.sh b/hack/installers/install-kustomize.sh
index a706b44495a27..7a8f2ed3e0efc 100755
--- a/hack/installers/install-kustomize.sh
+++ b/hack/installers/install-kustomize.sh
@@ -22,7 +22,7 @@ fi
 # v3.2.1 = https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.2.1/kustomize_kustomize.v3.2.1_linux_amd64
 # v3.3.0 = https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.3.0/kustomize_v3.3.0_linux_amd64.tar.gz
 case $ARCHITECTURE in
-  arm|arm64)
+  arm|arm64|s390x|ppc64le)
       export TARGET_FILE=kustomize_${KUSTOMIZE_VERSION}_${INSTALL_OS}_${ARCHITECTURE}.tar.gz
       URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_${INSTALL_OS}_$ARCHITECTURE.tar.gz
       BINNAME=kustomize
diff --git a/hack/installers/install-protoc.sh b/hack/installers/install-protoc.sh
index 7462d86f02e72..82d491c81c3c0 100755
--- a/hack/installers/install-protoc.sh
+++ b/hack/installers/install-protoc.sh
@@ -21,6 +21,12 @@ case $OS in
       arm64|arm)
         protoc_arch=aarch_64
         ;;
+      s390x)
+        protoc_arch=s390_64
+        ;;
+      ppc64le)
+        protoc_arch=ppcle_64
+        ;;
       *)
         protoc_arch=x86_64
         ;;
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index d372ec394cb15..d1c520a711368 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -10110,7 +10110,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  annotations: null
   labels:
     app.kubernetes.io/component: redis
     app.kubernetes.io/name: argocd-redis-ha
@@ -10212,7 +10211,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  annotations: null
   labels:
     app.kubernetes.io/component: redis
     app.kubernetes.io/name: argocd-redis-ha-haproxy
@@ -11225,7 +11223,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  annotations: {}
   labels:
     app.kubernetes.io/component: redis
     app.kubernetes.io/name: argocd-redis-ha
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index 7969171e9a7f5..8e944d64138cd 100644
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1034,7 +1034,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  annotations: null
   labels:
     app.kubernetes.io/component: redis
     app.kubernetes.io/name: argocd-redis-ha
@@ -1136,7 +1135,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  annotations: null
   labels:
     app.kubernetes.io/component: redis
     app.kubernetes.io/name: argocd-redis-ha-haproxy
@@ -2149,7 +2147,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  annotations: {}
   labels:
     app.kubernetes.io/component: redis
     app.kubernetes.io/name: argocd-redis-ha
diff --git a/test/container/Dockerfile b/test/container/Dockerfile
index 1001e90fb9311..625b1387e1017 100644
--- a/test/container/Dockerfile
+++ b/test/container/Dockerfile
@@ -1,10 +1,10 @@
 FROM redis:6.2.6 as redis
 
-FROM node:12.18.4 as node
+FROM node:12.18.4-buster as node
 
 FROM golang:1.18 as golang
 
-FROM registry:2.7.1 as registry
+FROM registry:2.8 as registry
 
 FROM ubuntu:21.10
 
@@ -22,6 +22,7 @@ RUN  apt-get update && apt-get install --fix-missing -y \
         make \
         wget \
         gcc \
+        g++ \
         sudo \
         tini \
         zip && \