diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 453948668..82c74df15 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,6 +153,8 @@ jobs:
             goarch: ppc64le
           - goos: linux
             goarch: riscv64
+          - goos: linux
+            goarch: s390x
           - goos: freebsd
             goarch: amd64
           - goos: freebsd
@@ -201,6 +203,11 @@ jobs:
             echo "CGO_ENABLED=1" >> $GITHUB_ENV
             echo "CC=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
             ;;
+          linux/s390x)
+            packages+=" crossbuild-essential-s390x"
+            echo "CGO_ENABLED=1" >> $GITHUB_ENV
+            echo "CC=s390x-linux-gnu-gcc" >> $GITHUB_ENV
+            ;;
           windows/arm/v7)
             echo "CGO_ENABLED=0" >> $GITHUB_ENV
             ;;
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1cd2d2902..20d229212 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,6 +69,8 @@ jobs:
             dockerfile-platform: linux/arm64
           - dockerfile-ubuntu: 18.04
             dockerfile-platform: linux/ppc64le
+          - dockerfile-ubuntu: 18.04
+            dockerfile-platform: linux/s390x
           # riscv64 isn't supported by Ubuntu 18.04
           - dockerfile-ubuntu: 22.04
             dockerfile-platform: linux/riscv64