diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index a52c274d89..ebda14e825 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -5,6 +5,10 @@ on:
       - '**.md'
       - 'app/src/main/res/**/strings.xml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 5d496c284c..192116fc87 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -6,18 +6,16 @@ on:
     tags:
       - v*
 
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build app
     runs-on: ubuntu-latest
 
     steps:
-      - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.10.0
-        with:
-          access_token: ${{ github.token }}
-          all_but_latest: true
-
       - name: Clone repo
         uses: actions/checkout@v3
 
diff --git a/.github/workflows/cancel_pull_request.yml b/.github/workflows/cancel_pull_request.yml
deleted file mode 100644
index b451d1bda8..0000000000
--- a/.github/workflows/cancel_pull_request.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Cancel old pull request workflows
-
-on:
-  workflow_run:
-    workflows: ["PR build check"]
-    types:
-      - requested
-
-jobs:
-  cancel:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: styfle/cancel-workflow-action@0.10.0
-      with:
-        all_but_latest: true
-        workflow_id: ${{ github.event.workflow.id }}