diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
index 27516392d..56c7af38f 100644
--- a/.github/workflows/build-deb.yml
+++ b/.github/workflows/build-deb.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           echo "MIRRORSITE=http://deb.debian.org/debian" > /etc/pbuilderrc
           apt update
-          apt install -y git-buildpackage build-essential debhelper-compat default-libmysqlclient-dev krb5-multidev libapparmor-dev libbz2-dev libcap-dev libdb-dev libexpat-dev libexttextcat-dev libicu-dev libldap2-dev liblua5.4-dev liblz4-dev liblzma-dev libpam0g-dev libpq-dev libsasl2-dev libsodium-dev libsqlite3-dev libssl-dev libstemmer-dev libsystemd-dev libwrap0-dev libzstd-dev pkg-config zlib1g-dev git libunwind-dev rsync
+          apt install -y git-buildpackage build-essential debhelper-compat default-libmysqlclient-dev krb5-multidev libapparmor-dev libbz2-dev libcap-dev libdb-dev libexpat-dev libexttextcat-dev libicu-dev libldap2-dev liblua5.4-dev liblz4-dev liblzma-dev libpam0g-dev libpq-dev libsasl2-dev libsodium-dev libsqlite3-dev libssl-dev libstemmer-dev libsystemd-dev libtirpc-dev libwrap0-dev libzstd-dev pkg-config zlib1g-dev git libunwind-dev rsync
 
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/build-staging-deb.yml b/.github/workflows/build-staging-deb.yml
index d7c6f9f66..53a4e5d30 100644
--- a/.github/workflows/build-staging-deb.yml
+++ b/.github/workflows/build-staging-deb.yml
@@ -7,15 +7,30 @@ on:
   workflow_dispatch:
 
 jobs:
-  staging-amd64:
-    runs-on: ubuntu-latest
-    container: debian:12
+  staging:
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            container: debian:12
+            dir_suffix: ""
+          - runner: ubuntu-24.04-arm
+            container: debian:12
+            dir_suffix: ""
+          - runner: ubuntu-latest
+            container: debian:13
+            dir_suffix: -trixie
+          - runner: ubuntu-24.04-arm
+            container: debian:13
+            dir_suffix: -trixie
+    runs-on: ${{ matrix.runner }}
+    container: ${{ matrix.container }}
     steps:
       - name: install dependencies
         run: |
           echo "MIRRORSITE=http://deb.debian.org/debian" > /etc/pbuilderrc
           apt update
-          apt install -y git-buildpackage build-essential debhelper-compat default-libmysqlclient-dev krb5-multidev libapparmor-dev libbz2-dev libcap-dev libdb-dev libexpat-dev libexttextcat-dev libicu-dev libldap2-dev liblua5.4-dev liblz4-dev liblzma-dev libpam0g-dev libpq-dev libsasl2-dev libsodium-dev libsqlite3-dev libssl-dev libstemmer-dev libsystemd-dev libwrap0-dev libzstd-dev pkg-config zlib1g-dev git libunwind-dev rsync
+          apt install -y git-buildpackage build-essential debhelper-compat default-libmysqlclient-dev krb5-multidev libapparmor-dev libbz2-dev libcap-dev libdb-dev libexpat-dev libexttextcat-dev libicu-dev libldap2-dev liblua5.4-dev liblz4-dev liblzma-dev libpam0g-dev libpq-dev libsasl2-dev libsodium-dev libsqlite3-dev libssl-dev libstemmer-dev libsystemd-dev libtirpc-dev libwrap0-dev libzstd-dev pkg-config zlib1g-dev git libunwind-dev rsync
 
       - uses: actions/checkout@v4
         with:
@@ -38,40 +53,5 @@ jobs:
           echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
           chmod 600 "$HOME/.ssh/key"
           export branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          mv $GITHUB_WORKSPACE/build-area staging-$branch
-          rsync -rILvh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" staging-$branch "${{ secrets.USERNAME }}@download.delta.chat:/var/www/html/download/dovecot/"
-
-  staging-arm:
-    runs-on: ubuntu-24.04-arm
-    container: debian:12
-    steps:
-      - name: install dependencies
-        run: |
-          echo "MIRRORSITE=http://deb.debian.org/debian" > /etc/pbuilderrc
-          apt update
-          apt install -y git-buildpackage build-essential debhelper-compat default-libmysqlclient-dev krb5-multidev libapparmor-dev libbz2-dev libcap-dev libdb-dev libexpat-dev libexttextcat-dev libicu-dev libldap2-dev liblua5.4-dev liblz4-dev liblzma-dev libpam0g-dev libpq-dev libsasl2-dev libsodium-dev libsqlite3-dev libssl-dev libstemmer-dev libsystemd-dev libwrap0-dev libzstd-dev pkg-config zlib1g-dev git libunwind-dev rsync
-
-      - uses: actions/checkout@v4
-        with:
-          path: dovecot
-          show-progress: false
-          fetch-depth: 0
-
-      - name: build
-        run: |
-          cd dovecot
-          git rm -r .github
-          git config --local user.name "test"
-          git config --local user.email "test@example.org"
-          git commit -am "CI: remove .github directory before building"
-          DEB_BUILD_OPTIONS=nocheck gbp buildpackage --git-no-pristine-tar --git-ignore-branch -us -uc
-
-      - name: upload .deb files
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          export branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          mv $GITHUB_WORKSPACE/build-area staging-$branch
-          rsync -rILvh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" staging-$branch "${{ secrets.USERNAME }}@download.delta.chat:/var/www/html/download/dovecot/"
-
+          mv $GITHUB_WORKSPACE/build-area staging-$branch${{ matrix.dir_suffix }}
+          rsync -rILvh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" staging-$branch${{ matrix.dir_suffix }} "${{ secrets.USERNAME }}@download.delta.chat:/var/www/html/download/dovecot/"