diff --git a/.github/workflows/azure-e2e-test.yml b/.github/workflows/azure-e2e-test.yml
index 863409934..1efd2213f 100644
--- a/.github/workflows/azure-e2e-test.yml
+++ b/.github/workflows/azure-e2e-test.yml
@@ -29,6 +29,10 @@ on:
         type: string
         description: prebuilt caa image
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-caa-container-image:
     if: github.event.inputs.caa-image == ''
diff --git a/.github/workflows/azure-nightly-build.yml b/.github/workflows/azure-nightly-build.yml
index c5de4f280..8276a9e87 100644
--- a/.github/workflows/azure-nightly-build.yml
+++ b/.github/workflows/azure-nightly-build.yml
@@ -6,6 +6,10 @@ on:
   # will base on default branch `main`
   - cron: '0 3 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   generate-podvm-image-version:
     if: github.event.inputs.podvm-image-id == ''
diff --git a/.github/workflows/azure-podvm-image-build.yml b/.github/workflows/azure-podvm-image-build.yml
index 3fb836f5c..c69b4c46a 100644
--- a/.github/workflows/azure-podvm-image-build.yml
+++ b/.github/workflows/azure-podvm-image-build.yml
@@ -33,6 +33,10 @@ env:
   UPLOSI_SHA256: "687bcab7398ab0fda65a3809492e8cd4d6a25aad1573927be5ec75ac1c4cbc35"
   IMAGE_ID: "/CommunityGalleries/${{ vars.AZURE_COMMUNITY_GALLERY_NAME }}/Images/${{ vars.AZURE_PODVM_IMAGE_DEF_NAME }}/Versions/${{ inputs.image-version }}"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-podvm-image:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/build-golang-fedora.yaml b/.github/workflows/build-golang-fedora.yaml
index 255849b32..9fb5407c6 100644
--- a/.github/workflows/build-golang-fedora.yaml
+++ b/.github/workflows/build-golang-fedora.yaml
@@ -25,6 +25,10 @@ on:
         description: "The tag part of the container image name"
         default: ""
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fc1028f6d..2711ac640 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,6 +9,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   caa:
     name: cloud-api-adaptor
diff --git a/.github/workflows/commit-message-check.yaml b/.github/workflows/commit-message-check.yaml
index 4cda39961..8353ba6cd 100644
--- a/.github/workflows/commit-message-check.yaml
+++ b/.github/workflows/commit-message-check.yaml
@@ -9,6 +9,10 @@ env:
 
     https://github.com/confidential-containers/confidential-containers/blob/main/CONTRIBUTING.md#patch-format
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   commit-message-check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/daily-e2e-tests-ibmcloud.yaml b/.github/workflows/daily-e2e-tests-ibmcloud.yaml
index 833fe890a..7e3463dd5 100644
--- a/.github/workflows/daily-e2e-tests-ibmcloud.yaml
+++ b/.github/workflows/daily-e2e-tests-ibmcloud.yaml
@@ -12,6 +12,10 @@ on:
     - cron: '0 5 * * *'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   daily-e2e-tests:
     name: e2e tests
diff --git a/.github/workflows/daily-e2e-tests-libvirt.yaml b/.github/workflows/daily-e2e-tests-libvirt.yaml
index 29437df9f..3c0b29333 100644
--- a/.github/workflows/daily-e2e-tests-libvirt.yaml
+++ b/.github/workflows/daily-e2e-tests-libvirt.yaml
@@ -12,6 +12,10 @@ on:
     - cron: '15 4 * * *'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   e2e:
     uses: ./.github/workflows/e2e_run_all.yaml
diff --git a/.github/workflows/e2e_on_pull.yaml b/.github/workflows/e2e_on_pull.yaml
index 8da9868c5..276575700 100644
--- a/.github/workflows/e2e_on_pull.yaml
+++ b/.github/workflows/e2e_on_pull.yaml
@@ -26,6 +26,10 @@ on:
     branches:
       - 'main'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   authorize:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
index 706dad086..f585ccd3f 100644
--- a/.github/workflows/links.yml
+++ b/.github/workflows/links.yml
@@ -7,6 +7,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   checklinks:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index df7a22f83..0956e6c55 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -12,6 +12,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   vet-and-fmt:
     name: vet and fmt
diff --git a/.github/workflows/publish_images_on_push.yaml b/.github/workflows/publish_images_on_push.yaml
index f21097a98..a26f2c0b7 100644
--- a/.github/workflows/publish_images_on_push.yaml
+++ b/.github/workflows/publish_images_on_push.yaml
@@ -9,9 +9,12 @@ on:
   push:
     branches:
       - 'main'
-
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   caa:
     uses: ./.github/workflows/caa_build_and_push_per_arch.yaml
@@ -31,7 +34,7 @@ jobs:
     with:
       image_tags: latest,${{ github.sha }}
       git_ref: ${{ github.sha }}
-    secrets: inherit  
+    secrets: inherit
 
   webhook:
     uses: ./.github/workflows/webhook_image.yaml