diff --git a/.github/workflows/codeflash-optimize.yaml b/.github/workflows/codeflash-optimize.yaml
index b176ad7a8..5a08179fd 100644
--- a/.github/workflows/codeflash-optimize.yaml
+++ b/.github/workflows/codeflash-optimize.yaml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/e2e-async.yaml b/.github/workflows/e2e-async.yaml
index 44dfe02ad..9eb408298 100644
--- a/.github/workflows/e2e-async.yaml
+++ b/.github/workflows/e2e-async.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   async-optimization:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-bubblesort-benchmark.yaml b/.github/workflows/e2e-bubblesort-benchmark.yaml
index d57b4f953..2a9f413c0 100644
--- a/.github/workflows/e2e-bubblesort-benchmark.yaml
+++ b/.github/workflows/e2e-bubblesort-benchmark.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   benchmark-bubble-sort-optimization:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-bubblesort-pytest-nogit.yaml b/.github/workflows/e2e-bubblesort-pytest-nogit.yaml
index 2b8fb7eda..ac63b7cec 100644
--- a/.github/workflows/e2e-bubblesort-pytest-nogit.yaml
+++ b/.github/workflows/e2e-bubblesort-pytest-nogit.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   bubble-sort-optimization-pytest-no-git:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-bubblesort-unittest.yaml b/.github/workflows/e2e-bubblesort-unittest.yaml
index 7d5aaf0bc..3f80e61f8 100644
--- a/.github/workflows/e2e-bubblesort-unittest.yaml
+++ b/.github/workflows/e2e-bubblesort-unittest.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   bubble-sort-optimization-unittest:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-coverage-optimization.yaml b/.github/workflows/e2e-coverage-optimization.yaml
index 8d08dda18..cd5a16e6a 100644
--- a/.github/workflows/e2e-coverage-optimization.yaml
+++ b/.github/workflows/e2e-coverage-optimization.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   end-to-end-test-coverage:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-futurehouse-structure.yaml b/.github/workflows/e2e-futurehouse-structure.yaml
index 50b3cd001..ba34046d2 100644
--- a/.github/workflows/e2e-futurehouse-structure.yaml
+++ b/.github/workflows/e2e-futurehouse-structure.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   futurehouse-structure:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-init-optimization.yaml b/.github/workflows/e2e-init-optimization.yaml
index 3f009bc5f..5bb6d2c02 100644
--- a/.github/workflows/e2e-init-optimization.yaml
+++ b/.github/workflows/e2e-init-optimization.yaml
@@ -6,6 +6,10 @@ on:
       - '**'  # Trigger for all paths
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   init-optimization:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-topological-sort.yaml b/.github/workflows/e2e-topological-sort.yaml
index aca07b44f..dc40df845 100644
--- a/.github/workflows/e2e-topological-sort.yaml
+++ b/.github/workflows/e2e-topological-sort.yaml
@@ -7,6 +7,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   topological-sort-worktree-optimization:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/e2e-tracer-replay.yaml b/.github/workflows/e2e-tracer-replay.yaml
index 31a8aba9e..dd64af9b2 100644
--- a/.github/workflows/e2e-tracer-replay.yaml
+++ b/.github/workflows/e2e-tracer-replay.yaml
@@ -6,6 +6,10 @@ on:
       - '**'  # Trigger for all paths
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   tracer-replay:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index d4e07c9d2..bccaa46cb 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -6,6 +6,10 @@ on:
       - main
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   type-check-cli:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index bc0a20ae8..00385f08d 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -6,7 +6,7 @@ on:
       - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index dc98d8d0f..88130cd03 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -6,6 +6,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   unit-tests:
     strategy:
diff --git a/.github/workflows/windows-unit-tests.yml b/.github/workflows/windows-unit-tests.yml
index 18865d5e4..20b2da52e 100644
--- a/.github/workflows/windows-unit-tests.yml
+++ b/.github/workflows/windows-unit-tests.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   windows-unit-tests:
     continue-on-error: true