diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2aaef08..db7623e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,9 +115,46 @@ jobs:
             hugo version
             hugo env --logLevel debug
 
+  # Move to CD later?
+  build_wheels_linux_s390x:
+    name: linux-s390x-python-3.12
+    needs: [style]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d  # v5.1.0
+        with:
+          python-version: 3.12
+
+      - name: Set up QEMU for emulation
+        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3  # v3.0.0
+        with:
+          platforms: all
+
+      - name: Build binary distribution (wheel) on Linux (s390x)
+        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce  # v2.17.0
+        env:
+          CIBW_BUILD: "cp312-*"
+          CIBW_ARCHS_LINUX: s390x
+          CIBW_BEFORE_ALL_LINUX: |
+            curl -LJO https://golang.org/dl/go1.22.2.linux-s390x.tar.gz
+            mkdir $HOME/go_installed/
+            tar -C $HOME/go_installed/ -xzf go1.22.2.linux-s390x.tar.gz
+            export PATH=$PATH:$HOME/go_installed/go/bin >> ~/.bashrc
+            export PATH=$PATH:$HOME/go_installed/go/bin >> ~/.bash_profile
+            go version
+            python -c "import sys; print(sys.platform)"
+            python -c "import platform; print(platform.architecture())"
+            python -c "import platform; print(platform.machine())"
+          CIBW_ENVIRONMENT_LINUX: PATH=$PATH:$HOME/go_installed/go/bin
+          CIBW_TEST_COMMAND: >
+            hugo version
+            hugo env --logLevel debug
+          CIBW_MANYLINUX_S390X_IMAGE: "manylinux_2_28"
+
   experimental:
     needs: [style]
-    name: ${{ matrix.runs-on }}-${{ matrix.architecture }}-python-${{ matrix.python-version }}
+    name: zig-${{ matrix.runs-on }}-${{ matrix.architecture }}-python-${{ matrix.python-version }}
     env:
       CIBW_BUILD_VERBOSITY: 2
     runs-on: ${{ matrix.runs-on }}