diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index f8ea2ff2..795ea87e 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -10,8 +10,8 @@ jobs:
     name: Build and Test
     runs-on: ubuntu-20.04-8core-sl
     concurrency:
-      group: ${{ github.workflow }}-main
-      cancel-in-progress: false
+      group: ${{ github.workflow }}-main-${{ matrix.images.target }}
+      cancel-in-progress: true
     permissions:
       contents: read
       deployments: write