diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5e1ceba8..4d95f7e7 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -5,9 +5,14 @@ on:
     branches:
       - master
       - develop
+
 env:
   PNPM_CACHE_FOLDER: .pnpm-store
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   build-and-test:
     runs-on: ${{ matrix.os }}