diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml
index 294ad4e0c6cf..36d8e9a5427b 100644
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -32,6 +32,12 @@ env:
     --no-transfer-progress
     --fail-fast
 
+concurrency:
+  # One group per PR, or per ref for branch pushes.
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  # Cancel in-progress runs for PRs only, so release branch builds always complete.
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   check-format:
     name: "Check if code needs formatting"