diff --git a/.github/workflows/pkg-pr-hook.yml b/.github/workflows/pkg-pr-hook.yml
deleted file mode 100644
index 300acf5..0000000
--- a/.github/workflows/pkg-pr-hook.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: PR Pre and Post Merge Build
-
-on:
-  pull_request:
-    branches: [ debian/*, qcom/** ]
-    types: [ opened, synchronize, reopened, closed ]
-
-permissions:
-  contents: read
-  packages: read
-
-jobs:
-  resolve-suite:
-    name: Resolve suite from branch
-    runs-on: ubuntu-latest
-    outputs:
-      suite: ${{ steps.resolve.outputs.suite }}
-    steps:
-      - name: Derive suite from target branch
-        id: resolve
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: |
-          set -euo pipefail
-          case "$BASE_REF" in
-            qcom/ubuntu/*|qcom/debian/*)
-              suite="${BASE_REF##*/}"
-              ;;
-            *)
-              suite=sid
-              ;;
-          esac
-          echo "suite=$suite" >> "$GITHUB_OUTPUT"
-          echo "Resolved suite: $suite (from branch: $BASE_REF)"
-
-  build:
-    name: Build Debian Package
-    needs: resolve-suite
-    if: ${{ github.event.action != 'closed' || github.event.pull_request.merged == true }}
-    uses: qualcomm-linux/qcom-build-utils/.github/workflows/pkg-build-reusable-workflow.yml@main
-    with:
-      qcom-build-utils-ref: main
-      # PRE-MERGE: use the PR head branch (github.head_ref)
-      # POST-MERGE: use the base branch name from the PR
-      debian-ref: ${{ (github.event.action == 'closed' && github.event.pull_request.merged) && github.event.pull_request.base.ref || github.head_ref }}
-      suite: ${{ needs.resolve-suite.outputs.suite }}
-      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
-    secrets:
-      DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
-      DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
new file mode 100644
index 0000000..54654b9
--- /dev/null
+++ b/.github/workflows/pr-build.yml
@@ -0,0 +1,91 @@
+name: PR Build
+
+# Build-test packaging PRs through the same pipeline the daily builds use.
+
+on:
+  pull_request:
+    branches: [ debian/*, qcom/** ]
+
+concurrency:
+  group: pr-build-${{ github.event.number }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  # ---------------------------------------------------------------------------
+  # configure-matrix: flatten the Daily rows from main's ci/build-matrix.json.
+  #
+  # The matrix and its resolver only exist on main, so this job checks main out
+  # rather than the PR head. Nothing from the PR is read here; the PR is only
+  # ever consumed downstream, as a packaging ref.
+  # ---------------------------------------------------------------------------
+  configure-matrix:
+    name: Configure build matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      ci-sha: ${{ steps.set-matrix.outputs.ci-sha }}
+    steps:
+      - name: Checkout CI branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          persist-credentials: false
+
+      - name: Generate build matrix
+        id: set-matrix
+        run: |
+          set -euo pipefail
+          MATRIX=$(ci/scripts/resolve-matrix.sh --type Daily)
+          echo "matrix=$MATRIX" >> "$GITHUB_OUTPUT"
+          echo "Matrix entries: $(echo "$MATRIX" | jq length)"
+          # Report the exact commit this matrix came from, so the build legs
+          # load their CI scripts from the same tree that produced their inputs.
+          CI_SHA=$(git rev-parse HEAD)
+          echo "ci-sha=$CI_SHA" >> "$GITHUB_OUTPUT"
+          echo "CI ref: $CI_SHA"
+
+  # ---------------------------------------------------------------------------
+  # build: one parallel job per flat matrix entry, mirroring daily.yml.
+  #
+  # fail-fast is disabled so a broken trixie leg still leaves forky and
+  # resolute results on the PR.
+  # ---------------------------------------------------------------------------
+  build:
+    name: ${{ matrix.kernel_variant }} / ${{ matrix.suite }}
+    needs: configure-matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.configure-matrix.outputs.matrix) }}
+    uses: qualcomm-linux/pkg-linux-qcom/.github/workflows/build-kernel-deb.yml@main
+    with:
+      suite: ${{ matrix.suite }}
+      kernel-variant: ${{ matrix.kernel_variant }}
+      git-clone: ${{ matrix.git_clone }}
+      kernel-branch: ${{ matrix.branch_or_tag }}
+      ref-strategy: ${{ matrix.ref_strategy }}
+      tag-pattern: ${{ matrix.tag_pattern || '' }}
+      srcpkg: ${{ matrix.srcpkg }}
+      binpkg: ${{ matrix.binpkg }}
+      kernel-config: ${{ matrix.kernel_config }}
+      debian-revision: ${{ matrix.debian_revision }}
+      localversion: ${{ matrix.localversion || '' }}
+      # Mark the version so PR artifacts never collide with the daily build's
+      # in the shared Debusine workspace.
+      kver-extra: -pr${{ github.event.number }}
+      # The reviewed commit, not the branch tip: a push mid-run must not change
+      # what this run tested. A SHA also resolves for fork PRs, whose head
+      # branch does not exist in this repository.
+      pkg-linux-qcom-ref: ${{ github.event.pull_request.head.sha }}
+      # Required from a packaging branch: build-kernel-deb.yml otherwise looks
+      # for ci/scripts at the caller's own commit, which here carries none.
+      ci-ref: ${{ needs.configure-matrix.outputs.ci-sha }}
+    secrets:
+      # No DEBUSINE_RELEASE_TOKEN: PR builds never promote to a release
+      # workspace, so they leave target-workspace empty.
+      DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
+      DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}