diff --git a/.github/workflows/image-build-test.yaml b/.github/workflows/image-build-test.yaml
index 917ce663..dc0c97ba 100644
--- a/.github/workflows/image-build-test.yaml
+++ b/.github/workflows/image-build-test.yaml
@@ -2,7 +2,7 @@ name: image-build-test
 on: [push, pull_request]
 
 env:
-  BUILD_PLATFORMS: linux/amd64,linux/arm64,linux/ppc64le
+  BUILD_PLATFORMS: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
 
 jobs:
   build-image:
diff --git a/.github/workflows/image-push-main.yaml b/.github/workflows/image-push-main.yaml
index 5fe74d24..a6c9cef0 100644
--- a/.github/workflows/image-push-main.yaml
+++ b/.github/workflows/image-push-main.yaml
@@ -2,7 +2,7 @@ name: "Push images on merge to main"
 
 env:
   IMAGE_NAME: ghcr.io/${{ github.repository }}-plugin
-  BUILD_PLATFORMS: linux/amd64,linux/arm64,linux/ppc64le
+  BUILD_PLATFORMS: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
 
 on:
   push:
diff --git a/.github/workflows/image-push-release.yaml b/.github/workflows/image-push-release.yaml
index f45fe53b..619b8025 100644
--- a/.github/workflows/image-push-release.yaml
+++ b/.github/workflows/image-push-release.yaml
@@ -2,7 +2,7 @@ name: "Push images on release"
 
 env:
   IMAGE_NAME: ghcr.io/${{ github.repository }}-plugin
-  BUILD_PLATFORMS: linux/amd64,linux/arm64,linux/ppc64le
+  BUILD_PLATFORMS: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
 
 on:
   push:
diff --git a/hack/install-go.sh b/hack/install-go.sh
index 8be7adec..ac92526c 100755
--- a/hack/install-go.sh
+++ b/hack/install-go.sh
@@ -2,7 +2,8 @@
 
 destination=$1
 version=$(curl -s https://go.dev/dl/?mode=json | jq -r ".[0].version")
-tarball=$version.linux-amd64.tar.gz
+arch=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/')
+tarball=$version.linux-$arch.tar.gz
 url=https://dl.google.com/go/
 
 mkdir -p $destination