diff --git a/.github/workflows/bbw_build_container_template.yml b/.github/workflows/bbw_build_container_template.yml
new file mode 100644
index 00000000..ec3b19e6
--- /dev/null
+++ b/.github/workflows/bbw_build_container_template.yml
@@ -0,0 +1,179 @@
+---
+name: bbw-build-container-template
+
+on:
+  workflow_call:
+    inputs:
+      dockerfile:
+        required: true
+        type: string
+      image:
+        required: true
+        type: string
+      platforms:
+        required: true
+        type: string
+      tag:
+        required: false
+        type: string
+      runner:
+        required: false
+        type: string
+      clang_version:
+        required: false
+        type: string
+      branch:
+        required: false
+        type: string
+      install_valgrind:
+        required: false
+        type: string
+      files:
+        required: false
+        type: string
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runner || 'ubuntu-22.04' }}
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
+    name: ${{ inputs.image }} (${{ inputs.tag }} ${{ inputs.platforms }})
+    env:
+      BUILD_RHEL: false
+      DEPLOY_IMAGES: false
+      WORKDIR: ci_build_images
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up env vars
+        run: |
+          set -vx
+          [[ -n "${{ inputs.image }}" ]] || {
+            echo "Missing base image (FROM)"
+            exit 1
+          }
+          if [[ -n "${{ inputs.tag }}" ]]; then
+            echo "IMG=${{ inputs.tag }}" >>$GITHUB_ENV
+          else
+            TAG_TMP=${{ inputs.image }}
+            echo "IMG=${TAG_TMP/:/}" >>$GITHUB_ENV
+          fi
+          echo "REPO=bb-worker" >>$GITHUB_ENV
+      - name: Generate Dockerfile and necessary files
+        run: |
+          cd ${{ env.WORKDIR }}
+          cat ${{ inputs.dockerfile }} qpress.Dockerfile buildbot-worker.Dockerfile >$GITHUB_WORKSPACE/Dockerfile
+          cp -r qpress $GITHUB_WORKSPACE
+
+      - name: Copy files on runner
+        if: ${{ inputs.files }}
+        run: |
+            for file in $(echo '${{ inputs.files }}' | jq -c '.[]'); do
+                source=$(echo $file | jq -r '.source')
+                target=$(echo $file | jq -r '.target')
+                cp $source $target
+            done
+
+      - name: No wsrep on 32 bit platforms
+        if: >
+          (contains(inputs.platforms, 'linux/386'))
+        run: |
+          sed -i -e '/WSREP_PROVIDER/d' $GITHUB_WORKSPACE/Dockerfile
+      - name: Check Dockerfile with hadolint
+        run: |
+          docker run -i -v $(pwd):/mnt -w /mnt ghcr.io/hadolint/hadolint:latest hadolint /mnt/Dockerfile
+      - name: Install qemu-user-static
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+      - name: Build image
+        run: |
+          podman manifest create ${{ env.REPO }}:${{ env.IMG }}
+          for arch in $(echo ${{ inputs.platforms }} | sed 's/,/ /g'); do
+            msg="Build $arch:"
+            line="${msg//?/=}"
+            printf "\n${line}\n${msg}\n${line}\n"
+            podman buildx build --tag ${{ env.REPO }}:${{ env.IMG }}-${arch//\//-} \
+              --platform $arch \
+              --manifest ${{ env.REPO }}:${{ env.IMG }} \
+              -f $GITHUB_WORKSPACE/Dockerfile \
+              --build-arg BASE_IMAGE=${{ inputs.image }} \
+              --build-arg CLANG_VERSION=${{ inputs.clang_version }} \
+              --build-arg MARIADB_BRANCH=${{ inputs.branch }} \
+              --build-arg INSTALL_VALGRIND="${{ inputs.install_valgrind }}"
+          done
+          podman images
+      - name: Push images to local registry
+        run: |
+          podman manifest push --tls-verify=0 \
+            --all ${{ env.REPO }}:${{ env.IMG }} \
+            docker://localhost:5000/${{ env.REPO }}:${{ env.IMG }}
+      - name: Check multi-arch container
+        run: |
+          # make some space on the runner
+          if [[ -d $HOME/.local/share/containers ]]; then
+            sudo rm -rf $HOME/.local/share/containers
+          fi
+          for p in ${{ inputs.platforms }}; do
+            platform="${p/,/}"
+            image="localhost:5000/bb-worker:${{ env.IMG }}"
+            msg="Testing docker image $image on platform $platform"
+            line="${msg//?/=}"
+            printf "\n${line}\n${msg}\n${line}\n"
+            docker pull -q --platform "$platform" "$image"
+            docker run -i "$image" buildbot-worker --version
+            docker run -i "$image" dumb-init twistd --pidfile= -y /home/buildbot/buildbot.tac
+            docker run -u root -i "$image" bash -c "touch /tmp/foo && qpress -r /tmp /root/qpress.qp"
+          done
+      - name: Check for registry credentials
+        run: |
+          missing=()
+          [[ -n "${{ secrets.QUAY_USER }}" ]] || missing+=(QUAY_USER)
+          [[ -n "${{ secrets.QUAY_TOKEN }}" ]] || missing+=(QUAY_TOKEN)
+          for i in "${missing[@]}"; do
+            echo "Missing github secret: $i"
+          done
+          if (( ${#missing[@]} == 0 )); then
+            echo "DEPLOY_IMAGES=true" >> $GITHUB_ENV
+          else
+            echo "Not pushing images to registry"
+          fi
+      - name: Login to ghcr.io
+        if: ${{ env.DEPLOY_IMAGES == 'true' }}
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push images to ghcr.io
+        if: ${{ env.DEPLOY_IMAGES == 'true' }}
+        run: |
+          msg="Push docker image to ghcr.io (${{ env.IMG }})"
+          line="${msg//?/=}"
+          printf "\n${line}\n${msg}\n${line}\n"
+          skopeo copy --all --src-tls-verify=0 \
+            docker://localhost:5000/${{ env.REPO }}:${{ env.IMG }} \
+            docker://ghcr.io/${GITHUB_REPOSITORY,,}/${{ env.REPO }}:${{ env.IMG }}
+
+      - name: Login to registry
+        if: ${{ env.DEPLOY_IMAGES == 'true' }}
+        uses: docker/login-action@v2
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USER }}
+          password: ${{ secrets.QUAY_TOKEN }}
+
+      # Uncomment this when we disable the old workflow
+      # - name: Push images to quay.io
+      #   if: ${{ env.DEPLOY_IMAGES == 'true' }}
+      #   run: |
+      #     msg="Push docker image to quay.io (${{ env.IMG }})"
+      #     line="${msg//?/=}"
+      #     printf "\n${line}\n${msg}\n${line}\n"
+      #     skopeo copy --all --src-tls-verify=0 \
+      #     docker://localhost:5000/${{ env.REPO }}:${{ env.IMG }} \
+      #     docker://quay.io/mariadb-foundation/${{ env.REPO }}:${{ env.IMG }}
diff --git a/.github/workflows/build-centos-based.yml b/.github/workflows/build-centos-based.yml
new file mode 100644
index 00000000..ec91460a
--- /dev/null
+++ b/.github/workflows/build-centos-based.yml
@@ -0,0 +1,35 @@
+name: Build CentOS based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/centos.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-centos-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/centos.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-centos-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: almalinux:8
+            platforms: linux/amd64, linux/arm64/v8
+          - image: rockylinux:8
+            platforms: linux/amd64, linux/arm64/v8
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: centos.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+    secrets: inherit
diff --git a/.github/workflows/build-centos.pip-based.yml b/.github/workflows/build-centos.pip-based.yml
new file mode 100644
index 00000000..0ece5a98
--- /dev/null
+++ b/.github/workflows/build-centos.pip-based.yml
@@ -0,0 +1,47 @@
+name: Build CentOS:pip based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/centos.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-centos.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/centos.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-centos.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: almalinux:9
+            platforms: linux/amd64, linux/arm64/v8
+
+          - image: rockylinux:9
+            platforms: linux/amd64, linux/arm64/v8
+
+          - image: quay.io/centos/centos:stream9
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
+            tag: centosstream9
+            runner: ubuntu-24.04
+
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: centos.Dockerfile pip.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      runner: ${{ matrix.runner }}
+      tag: ${{ matrix.tag }}
+    secrets: inherit
diff --git a/.github/workflows/build-centos7.pip-based.yml b/.github/workflows/build-centos7.pip-based.yml
new file mode 100644
index 00000000..7e3650a7
--- /dev/null
+++ b/.github/workflows/build-centos7.pip-based.yml
@@ -0,0 +1,35 @@
+name: Build CentOS7:pip based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/centos7.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-centos7.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/centos7.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-centos7.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: centos:7
+            platforms: linux/amd64
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: centos7.Dockerfile pip.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+    secrets: inherit
diff --git a/.github/workflows/build-debian-based.yml b/.github/workflows/build-debian-based.yml
new file mode 100644
index 00000000..74c5e0df
--- /dev/null
+++ b/.github/workflows/build-debian-based.yml
@@ -0,0 +1,73 @@
+name: Build Debian based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: debian:11
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
+            branch: 10.11
+
+          - image: debian:12
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
+            branch: 10.11
+            tag: debian12
+
+          - image: debian:12
+            platforms: linux/386
+            branch: 10.11
+            tag: debian12-386
+
+          - image: debian:sid
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
+            branch: 10.11
+
+          - image: debian:sid
+            platforms: linux/386
+            branch: 10.11
+            tag: debiansid-386
+
+          - image: ubuntu:20.04
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
+            branch: 10.11
+
+          - image: ubuntu:22.04
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
+            branch: 10.11
+
+          - image: ubuntu:23.10
+            platforms: linux/amd64, linux/arm64/v8
+            branch: 10.11
+
+          - image: ubuntu:24.04
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
+            branch: 10.11
+
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: debian.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      branch: ${{ matrix.branch }}
+    secrets: inherit
diff --git a/.github/workflows/build-debian.aocc-based.yml b/.github/workflows/build-debian.aocc-based.yml
new file mode 100644
index 00000000..3950e2d7
--- /dev/null
+++ b/.github/workflows/build-debian.aocc-based.yml
@@ -0,0 +1,39 @@
+name: Build Debian:aocc based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/aocc.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian.aocc-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/aocc.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian.aocc-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: debian:11
+            platforms: linux/amd64
+            branch: 10.11
+            tag: debian11-aocc
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: debian.Dockerfile aocc.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      branch: ${{ matrix.branch }}
+    secrets: inherit
diff --git a/.github/workflows/build-debian.jepsen-based.yml b/.github/workflows/build-debian.jepsen-based.yml
new file mode 100644
index 00000000..8cc1d664
--- /dev/null
+++ b/.github/workflows/build-debian.jepsen-based.yml
@@ -0,0 +1,39 @@
+name: Build Debian:jepsen based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/jepsen-mariadb.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian.jepsen-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/jepsen-mariadb.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian.jepsen-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: ubuntu:22.04
+            platforms: linux/amd64
+            branch: 10.11
+            tag: ubuntu22.04-jepsen-mariadb
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: debian.Dockerfile jepsen-mariadb.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      branch: ${{ matrix.branch }}
+    secrets: inherit
diff --git a/.github/workflows/build-debian.msan-based.yml b/.github/workflows/build-debian.msan-based.yml
new file mode 100644
index 00000000..0db38318
--- /dev/null
+++ b/.github/workflows/build-debian.msan-based.yml
@@ -0,0 +1,48 @@
+name: Build Debian:msan based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/msan.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian.msan-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/msan.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-debian.msan-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: debian:11
+            platforms: linux/amd64
+            branch: 10.11
+            tag: debian11-msan
+            clang_version: 15
+
+          - image: debian:11
+            platforms: linux/amd64
+            branch: 10.11
+            tag: debian11-msan-clang-16
+            clang_version: 16
+
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: debian.Dockerfile msan.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      branch: ${{ matrix.branch }}
+      clang_version: ${{ matrix.clang_version }}
+    secrets: inherit
diff --git a/.github/workflows/build-fedora-based.yml b/.github/workflows/build-fedora-based.yml
new file mode 100644
index 00000000..e6fa6c7a
--- /dev/null
+++ b/.github/workflows/build-fedora-based.yml
@@ -0,0 +1,47 @@
+name: Build Fedora based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/fedora.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-fedora-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/fedora.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-fedora-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: fedora:38
+            platforms: linux/amd64, linux/arm64/v8
+
+          - image: fedora:39
+            platforms: linux/amd64, linux/arm64/v8
+
+          - image: fedora:40
+            platforms: linux/amd64, linux/arm64/v8
+
+          - image: fedora:40
+            platforms: linux/amd64
+            tag: fedora40-valgrind
+            install_valgrind: "true"
+
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: fedora.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      install_valgrind: ${{ matrix.install_valgrind }}
+    secrets: inherit
diff --git a/.github/workflows/build-opensuse.pip-based.yml b/.github/workflows/build-opensuse.pip-based.yml
new file mode 100644
index 00000000..d99a4807
--- /dev/null
+++ b/.github/workflows/build-opensuse.pip-based.yml
@@ -0,0 +1,43 @@
+name: Build OpenSUSE:pip based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/opensuse.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - 'ci_build_images/mariadb_zypper_expect'
+      - .github/workflows/build-opensuse.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/opensuse.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - 'ci_build_images/mariadb_zypper_expect'
+      - .github/workflows/build-opensuse.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: opensuse/leap:15.6
+            platforms: linux/amd64
+            tag: opensuse15
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: opensuse.Dockerfile pip.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      files:
+        '[
+          {"name": "mariadb_zypper_expect", "source": "''$WORKDIR/mariadb_zypper_expect''", "target": "''$GITHUB_WORKSPACE''"}
+        ]'
+    secrets: inherit
diff --git a/.github/workflows/build-sles.pip-based.yml b/.github/workflows/build-sles.pip-based.yml
new file mode 100644
index 00000000..05318972
--- /dev/null
+++ b/.github/workflows/build-sles.pip-based.yml
@@ -0,0 +1,44 @@
+name: Build SLES:pip based images
+
+on:
+  push:
+    paths:
+      - 'ci_build_images/sles.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - 'ci_build_images/mariadb_zypper_expect'
+      - .github/workflows/build-sles.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+  pull_request:
+    paths:
+      - 'ci_build_images/sles.Dockerfile'
+      - 'ci_build_images/pip.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - 'ci_build_images/mariadb_zypper_expect'
+      - .github/workflows/build-sles.pip-based.yml
+      - .github/workflows/bbw_build_container_template.yml
+
+  workflow_call:
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: registry.suse.com/bci/bci-base:15.6
+            platforms: linux/amd64, linux/s390x
+            tag: sles15
+    uses: ./.github/workflows/bbw_build_container_template.yml
+    with:
+      dockerfile: sles.Dockerfile pip.Dockerfile
+      image: ${{ matrix.image }}
+      platforms: ${{ matrix.platforms }}
+      tag: ${{ matrix.tag }}
+      files:
+        '[
+          {"name": "mariadb_zypper_expect", "source": "''$WORKDIR/mariadb_zypper_expect''", "target": "''$GITHUB_WORKSPACE''"}
+        ]'
+    secrets: inherit
diff --git a/.github/workflows/build-workflow-dispatcher.yml b/.github/workflows/build-workflow-dispatcher.yml
new file mode 100644
index 00000000..6d1ba3a3
--- /dev/null
+++ b/.github/workflows/build-workflow-dispatcher.yml
@@ -0,0 +1,97 @@
+name: Dispatch all build container images workflows
+
+on:
+  workflow_dispatch:
+    inputs:
+      build-centos-based:
+        description: 'Run CentOS-based builds'
+        required: true
+        default: false
+        type: boolean
+      build-centos7pip-based:
+        description: 'Run CentOS 7 pip-based builds'
+        required: true
+        default: false
+        type: boolean
+      build-centospip-based:
+        description: 'Run CentOS pip-based builds'
+        required: true
+        default: false
+        type: boolean
+      build-debian-based:
+        description: 'Run Debian based builds'
+        required: true
+        default: false
+        type: boolean
+      build-debian-aocc-based:
+        description: 'Run Debian aocc based builds'
+        required: true
+        default: false
+        type: boolean
+      build-debian-jepsen-based:
+        description: 'Run Debian jepsen based builds'
+        required: true
+        default: false
+        type: boolean
+      build-debian-msan-based:
+        description: 'Run Debian msan based builds'
+        required: true
+        default: false
+        type: boolean
+      build-fedora-based:
+        description: 'Run Fedora based builds'
+        required: true
+        default: false
+        type: boolean
+      build-opensusepip-based:
+        description: 'Run OpenSUSE pip based builds'
+        required: true
+        default: false
+        type: boolean
+      build-slespip-based:
+        description: 'Run SLES pip based builds'
+        required: true
+        default: false
+        type: boolean
+
+jobs:
+  build-centos-based:
+    if: ${{ inputs.build-centos-based }}
+    uses: ./.github/workflows/build-centos-based.yml
+    secrets: inherit
+  build-centos7pip-based:
+    if: ${{ inputs.build-centos7pip-based }}
+    uses: ./.github/workflows/build-centos7.pip-based.yml
+    secrets: inherit
+  build-centospip-based:
+    if: ${{ inputs.build-centospip-based }}
+    uses: ./.github/workflows/build-centos.pip-based.yml
+    secrets: inherit
+  build-debian-based:
+    if: ${{ inputs.build-debian-based }}
+    uses: ./.github/workflows/build-debian-based.yml
+    secrets: inherit
+  build-debian-aocc-based:
+    if: ${{ inputs.build-debian-aocc-based }}
+    uses: ./.github/workflows/build-debian.aocc-based.yml
+    secrets: inherit
+  build-debian-jepsen-based:
+    if: ${{ inputs.build-debian-jepsen-based }}
+    uses: ./.github/workflows/build-debian.jepsen-based.yml
+    secrets: inherit
+  build-debian-msan-based:
+    if: ${{ inputs.build-debian-msan-based }}
+    uses: ./.github/workflows/build-debian.msan-based.yml
+    secrets: inherit
+  build-fedora-based:
+    if: ${{ inputs.build-fedora-based }}
+    uses: ./.github/workflows/build-fedora-based.yml
+    secrets: inherit
+  build-opensusepip-based:
+    if: ${{ inputs.build-opensusepip-based }}
+    uses: ./.github/workflows/build-opensuse.pip-based.yml
+    secrets: inherit
+  build-slespip-based:
+    if: ${{ inputs.build-slespip-based }}
+    uses: ./.github/workflows/build-sles.pip-based.yml
+    secrets: inherit