diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 37a68ade6c68a..f9fcd612698c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -177,7 +177,6 @@ jobs:
 
   build-s390x:
     needs: set-product-version
-    if: ${{ endsWith(github.repository, '-enterprise') }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -188,8 +187,10 @@ jobs:
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
 
       - name: Setup with node and yarn
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version: '14'
@@ -197,6 +198,7 @@ jobs:
           cache-dependency-path: 'ui/yarn.lock'
 
       - name: Build UI
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
         run: |
           CONSUL_VERSION=${{ needs.set-product-version.outputs.product-version }}
           CONSUL_DATE=${{ needs.set-product-version.outputs.product-date }}
@@ -210,6 +212,7 @@ jobs:
           rm -rf agent/uiserver/dist
           mv ui/packages/consul-ui/dist agent/uiserver/
       - name: Go Build
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
         env:
           PRODUCT_VERSION: ${{ needs.set-product-version.outputs.product-version }}
           PRERELEASE_VERSION: ${{ needs.set-product-version.outputs.pre-version }}
@@ -378,12 +381,13 @@ jobs:
       version: ${{ needs.set-product-version.outputs.product-version }}
       zip_name: consul_${{ needs.set-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
 
-    if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.arch != 's390x' }}
     name: Verify ${{ matrix.arch }} linux binary
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
 
       - name: Download ${{ matrix.arch  }} zip
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
           name: ${{ env.zip_name }}
@@ -396,6 +400,7 @@ jobs:
           platforms: arm,arm64
 
       - name: Run verification for ${{ matrix.arch }} binary
+        if: ${{ endsWith(github.repository, '-enterprise') }} || ${{ matrix.goarch }} != 's390x'
         run: .github/scripts/verify_artifact.sh ${{ env.zip_name }} v${{ env.version }}
 
   verify-darwin: