diff --git a/.github/workflows/check_license.yaml b/.github/workflows/check_license.yml
similarity index 86%
rename from .github/workflows/check_license.yaml
rename to .github/workflows/check_license.yml
index 3f4ac66..831dc45 100755
--- a/.github/workflows/check_license.yaml
+++ b/.github/workflows/check_license.yml
@@ -3,9 +3,14 @@ name: spdx
 on:
   pull_request
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
 jobs:
   check-spdx-headers:
     runs-on: ubuntu-latest
+
     steps:
 
     - name: Checkout code
diff --git a/.github/workflows/check_push_rights.yml b/.github/workflows/check_push_rights.yml
index c211b45..1bb76b8 100644
--- a/.github/workflows/check_push_rights.yml
+++ b/.github/workflows/check_push_rights.yml
@@ -5,10 +5,19 @@ on:
         description: "In possession of ghcr.io tokens?"
         value: ${{ jobs.check_push_rights.outputs.have_secrets }}
 
+
+# No concurrency group or cancel-in-progress here as this workflow is called from other workflows
+# so if you have a concurrency definition here it will be considered as a deadlock and job dismissed
+# The job below is also very fast, so no real need for cancel-in-progress
+
 jobs:
   check_push_rights:
     runs-on: ubuntu-latest
 
+    concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}-check_push_rights
+      cancel-in-progress: true
+
     outputs:
       have_secrets: ${{ steps.check-secrets.outputs.have_secrets }}
 
diff --git a/.github/workflows/kuksa_csv_provider.yml b/.github/workflows/kuksa_csv_provider.yml
index 04393ec..8df2439 100644
--- a/.github/workflows/kuksa_csv_provider.yml
+++ b/.github/workflows/kuksa_csv_provider.yml
@@ -24,6 +24,10 @@ on:
       - "csv_provider/**"
   workflow_dispatch:
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
 jobs:
   checkrights:
     uses: ./.github/workflows/check_push_rights.yml
diff --git a/.github/workflows/kuksa_dbc_feeder.yml b/.github/workflows/kuksa_dbc_feeder.yml
index 967a3c6..de33527 100644
--- a/.github/workflows/kuksa_dbc_feeder.yml
+++ b/.github/workflows/kuksa_dbc_feeder.yml
@@ -24,6 +24,10 @@ on:
       - "dbc2val/**"
   workflow_dispatch:
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
 jobs:
   checkrights:
     uses: ./.github/workflows/check_push_rights.yml
diff --git a/.github/workflows/kuksa_dds_feeder.yml b/.github/workflows/kuksa_dds_feeder.yml
index 55884a8..b328a07 100644
--- a/.github/workflows/kuksa_dds_feeder.yml
+++ b/.github/workflows/kuksa_dds_feeder.yml
@@ -22,6 +22,10 @@ on:
       - "dds2val/**"
   workflow_dispatch:
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
 jobs:
   check-dds-feeder:
     name: "Check DDS feeder"
diff --git a/.github/workflows/kuksa_gps_feeder.yml b/.github/workflows/kuksa_gps_feeder.yml
index fbc3344..ecbbbce 100644
--- a/.github/workflows/kuksa_gps_feeder.yml
+++ b/.github/workflows/kuksa_gps_feeder.yml
@@ -11,6 +11,10 @@ on:
      - "gps2val/**"
   workflow_dispatch:
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
 env:
   EPHEMERAL_IMAGE: "ttl.sh/kuksa.val.feeders/gps-${{ github.sha }}"
 
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index ed904de..c94edd7 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -2,9 +2,15 @@ name: pre-commit
 
 on: [pull_request]
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
+
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/someip2val_build.yml b/.github/workflows/someip2val_build.yml
index 34cd315..cb86c3f 100644
--- a/.github/workflows/someip2val_build.yml
+++ b/.github/workflows/someip2val_build.yml
@@ -28,6 +28,10 @@ on:
         required: false
         default: 'false'
 
+concurrency:
+      group: ${{ github.ref }}-${{ github.workflow }}
+      cancel-in-progress: true
+
 jobs:
 
   checkrights: