diff --git a/.github/workflows/check_docs.yml b/.github/workflows/check_docs.yml
index e1166c17e3a..e767a2c98bd 100644
--- a/.github/workflows/check_docs.yml
+++ b/.github/workflows/check_docs.yml
@@ -10,6 +10,10 @@ on:
     - develop
     - 'release-v**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check
diff --git a/.github/workflows/check_licenses.yml b/.github/workflows/check_licenses.yml
index 053383ff5c9..f0301f81ba9 100644
--- a/.github/workflows/check_licenses.yml
+++ b/.github/workflows/check_licenses.yml
@@ -10,6 +10,10 @@ on:
     - develop
     - 'release-v**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index fc8e0ea5c92..f742db3c19e 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -10,6 +10,10 @@ on:
     - develop
     - 'release-v**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check
diff --git a/.github/workflows/morango_integration.yml b/.github/workflows/morango_integration.yml
index 39767ebf09f..b8d75bd6fbb 100644
--- a/.github/workflows/morango_integration.yml
+++ b/.github/workflows/morango_integration.yml
@@ -8,6 +8,10 @@ on:
       - develop
       - release-*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check
diff --git a/.github/workflows/no_zombies.yml b/.github/workflows/no_zombies.yml
index a78f6829e05..d095048621d 100644
--- a/.github/workflows/no_zombies.yml
+++ b/.github/workflows/no_zombies.yml
@@ -10,6 +10,10 @@ on:
     - develop
     - 'release-v**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check
diff --git a/.github/workflows/npm_version_check.yml b/.github/workflows/npm_version_check.yml
index 2e1dd57242b..8534bfb35a5 100644
--- a/.github/workflows/npm_version_check.yml
+++ b/.github/workflows/npm_version_check.yml
@@ -5,6 +5,10 @@ on:
     paths:
       - 'packages/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pr_build_comment.yml b/.github/workflows/pr_build_comment.yml
index 187c3b4513f..b048af4268e 100644
--- a/.github/workflows/pr_build_comment.yml
+++ b/.github/workflows/pr_build_comment.yml
@@ -10,6 +10,7 @@ jobs:
   post:
     name: Add build artifact PR comment
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
     steps:
       - uses: actions/checkout@v6
       - name: Make text for build comment
diff --git a/.github/workflows/pr_build_kolibri.yml b/.github/workflows/pr_build_kolibri.yml
index 450ae489db6..e9efd0dbc6f 100644
--- a/.github/workflows/pr_build_kolibri.yml
+++ b/.github/workflows/pr_build_kolibri.yml
@@ -2,6 +2,10 @@ name: Kolibri Build Assets for Pull Request
 
 on: pull_request
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   prnumber:
     # The workflow_run event can't access the pull request
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9055b6fd547..b0e148f5b73 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -10,6 +10,10 @@ on:
     - develop
     - 'release-v**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 3507e7263bd..6cc2fd6735d 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -10,6 +10,10 @@ on:
     - develop
     - 'release-v**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pre_job:
     name: Path match check