diff --git a/.github/workflows/cpaas.yml b/.github/workflows/cpaas.yml
index 691376bc72e..3237e5977ce 100644
--- a/.github/workflows/cpaas.yml
+++ b/.github/workflows/cpaas.yml
@@ -101,6 +101,7 @@ jobs:
         vm_type:
           - rhel
           - rhel-sap
+          - rhel-s390x
     with:
       vm_type: ${{ matrix.vm_type }}
       collector-tag: ${{ needs.init.outputs.collector-tag }}-cpaas
@@ -122,7 +123,6 @@ jobs:
       fail-fast: false
       matrix:
         vm_type:
-          - rhel-s390x
           - rhel-ppc64le
     with:
       vm_type: ${{ matrix.vm_type }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index d72327c9f08..9161f11cc52 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -56,6 +56,20 @@ jobs:
       job-tag: ${{ inputs.job-tag }}
     secrets: inherit
 
+  multi-arch-integration-tests:
+    uses: ./.github/workflows/integration-tests-vm-type.yml
+    if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'skip-multiarch-builds')
+    strategy:
+      fail-fast: false
+      matrix:
+        vm_type:
+          - rhel-s390x
+    with:
+      vm_type: ${{ matrix.vm_type }}
+      collector-tag: ${{ inputs.collector-tag }}
+      job-tag: ${{ inputs.job-tag }}
+    secrets: inherit
+
   notify:
     runs-on: ubuntu-latest
     if: always() && contains(join(needs.*.result, ','), 'failure') && github.event_name == 'push'