diff --git a/.github/workflows/sel4bench-hw.yml b/.github/workflows/sel4bench-hw.yml
index 5b282d0e..23bef3f9 100644
--- a/.github/workflows/sel4bench-hw.yml
+++ b/.github/workflows/sel4bench-hw.yml
@@ -44,7 +44,7 @@ jobs:
     # To reduce the load on GitHub runner numbers and machine queue we cancel
     # any older runs of this workflow for the current PR.
     concurrency:
-      group: ${{ github.workflow }}-sel4bench-pr-build-${{ github.event.number }}
+      group: ${{ github.workflow }}-sel4bench-build-pr-${{ github.event.number }}-${{ strategy.job-index }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     concurrency:
-      group: ${{ github.workflow }}-sel4bench-pr-hw-run-${{ github.event.number }}
+      group: ${{ github.workflow }}-sel4bench-hw-run-pr-${{ github.event.number }}-${{ strategy.job-index }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
diff --git a/.github/workflows/sel4test-hw.yml b/.github/workflows/sel4test-hw.yml
index c40f713c..7a0e20d1 100644
--- a/.github/workflows/sel4test-hw.yml
+++ b/.github/workflows/sel4test-hw.yml
@@ -50,7 +50,7 @@ jobs:
     # To reduce the load (especially on the machine queue) we cancel any older
     # runs of this workflow for the current PR.
     concurrency:
-      group: ${{ github.workflow }}-sel4test-pr-build-${{ github.event.number }}
+      group: ${{ github.workflow }}-sel4test-build-pr-${{ github.event.number }}-${{ strategy.job-index }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
@@ -99,7 +99,7 @@ jobs:
                github.event.action == 'labeled' &&
                github.event.label.name == 'hw-test') }}
     concurrency:
-      group: ${{ github.workflow }}-sel4test-pr-hw-run-${{ github.event.number }}
+      group: ${{ github.workflow }}-sel4test-hw-run-pr-${{ github.event.number }}-${{ strategy.job-index }}
       cancel-in-progress: true
     strategy:
       fail-fast: false