diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d2b30b0..1e41673 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
     name: Create Release Artifacts
     strategy:
       matrix:
-        architecture: [aarch64, x86_64, ppc64le]
+        architecture: [aarch64, x86_64, ppc64le, s390x]
         ostype: [linux-gnu, linux-musl]
     runs-on: ubuntu-latest
     steps:
@@ -108,10 +108,12 @@ jobs:
         docker pull ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-aarch64-${{ matrix.ostype }}
         docker pull ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-x86_64-${{ matrix.ostype }}
         docker pull ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-ppc64le-${{ matrix.ostype }}
+        docker pull ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-s390x-${{ matrix.ostype }}
         docker manifest create ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-${{ matrix.ostype }} \
           ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-aarch64-${{ matrix.ostype }} \
           ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-x86_64-${{ matrix.ostype }} \
-          ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-ppc64le-${{ matrix.ostype }}
+          ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-ppc64le-${{ matrix.ostype }} \
+          ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-s390x-${{ matrix.ostype }}
         docker manifest push ghcr.io/hutchic-org/kong-openssl:${{ needs.release.outputs.release-git-tag }}-${{ matrix.ostype }}
 
   done:
diff --git a/Dockerfile b/Dockerfile
index a0242a6..c050cee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,13 +5,14 @@ ARG DOCKER_IMAGE_NAME
 
 
 # List out all image permutations to trick dependabot
-FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.1.2 as x86_64-linux-musl
-FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.1.2 as x86_64-linux-gnu
-FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.1.2 as aarch64-linux-musl
-FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.1.2 as aarch64-linux-gnu
-FROM --platform=linux/ppc64le ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.1.2 as ppc64le-linux-musl
-FROM --platform=linux/ppc64le ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.1.2 as ppc64le-linux-gnu
-
+FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.2.0 as x86_64-linux-musl
+FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.2.0 as x86_64-linux-gnu
+FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.2.0 as aarch64-linux-musl
+FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.2.0 as aarch64-linux-gnu
+FROM --platform=linux/ppc64le ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.2.0 as ppc64le-linux-musl
+FROM --platform=linux/ppc64le ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.2.0 as ppc64le-linux-gnu
+FROM --platform=linux/s390x ghcr.io/hutchic-org/kong-build-tools-base-images:apk-1.2.0 as s390x-linux-musl
+FROM --platform=linux/s390x ghcr.io/hutchic-org/kong-build-tools-base-images:rpm-1.2.0 as s390x-linux-gnu
 
 # Run the build script
 FROM $ARCHITECTURE-$OSTYPE as build