diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml
index 406cbc1ce..079097758 100644
--- a/.github/workflows/accessTests.yml
+++ b/.github/workflows/accessTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-access
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Access-Tests:
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index c278d458c..748d8eebc 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -1,7 +1,7 @@
 name: "Static Analysis"
 on: [push, pull_request]
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-static-check
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Go-Lint:
diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml
index 6491e7bb2..4624e66af 100644
--- a/.github/workflows/artifactoryTests.yml
+++ b/.github/workflows/artifactoryTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-artifactory
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Artifactory-Tests:
diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml
index 4c2122c7e..b0198c755 100644
--- a/.github/workflows/distributionTests.yml
+++ b/.github/workflows/distributionTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-distribution
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Distribution-Tests:
diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml
index 24f8ef58e..39824e9b7 100644
--- a/.github/workflows/dockerTests.yml
+++ b/.github/workflows/dockerTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-docker
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Docker-tests:
diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml
index d0f690b04..9706f79f9 100644
--- a/.github/workflows/goTests.yml
+++ b/.github/workflows/goTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-go
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   GO-tests:
diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml
index 3bee4b009..ed89dbc30 100644
--- a/.github/workflows/gradleTests.yml
+++ b/.github/workflows/gradleTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-gradle
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Gradle-Tests:
diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml
index 3a1f21583..b8e53e7f7 100644
--- a/.github/workflows/mavenTests.yml
+++ b/.github/workflows/mavenTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-maven
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Maven-Tests:
diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml
index 9c823f3e8..955d1d49c 100644
--- a/.github/workflows/npmTests.yml
+++ b/.github/workflows/npmTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-npm
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   npm-Tests:
diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml
index 859da2e39..31f4d3a7c 100644
--- a/.github/workflows/nugetTests.yml
+++ b/.github/workflows/nugetTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-nuget
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   NuGet-Tests:
diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml
index 168596729..80775064e 100644
--- a/.github/workflows/pluginsTests.yml
+++ b/.github/workflows/pluginsTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-plugins
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Plugins-Tests:
diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml
index e9bc89d55..f2c518357 100644
--- a/.github/workflows/pythonTests.yml
+++ b/.github/workflows/pythonTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-python
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Python-Tests:
diff --git a/.github/workflows/removeLabel.yml b/.github/workflows/removeLabel.yml
index 3028f5c1c..ba4469e78 100644
--- a/.github/workflows/removeLabel.yml
+++ b/.github/workflows/removeLabel.yml
@@ -5,7 +5,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-remove-label
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Remove-Label:
diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml
index fe18b3336..0bb82670d 100644
--- a/.github/workflows/scriptTests.yml
+++ b/.github/workflows/scriptTests.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-script
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Scripts-tests:
diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml
index 631ab81d6..5ee2d472e 100644
--- a/.github/workflows/transferTests.yml
+++ b/.github/workflows/transferTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-transfer
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   Transfer-Tests:
diff --git a/.github/workflows/xrayTests.yml b/.github/workflows/xrayTests.yml
index 9ed1f28ac..26641c7f0 100644
--- a/.github/workflows/xrayTests.yml
+++ b/.github/workflows/xrayTests.yml
@@ -7,7 +7,7 @@ on:
 # Ensures that only the latest commit is running for each PR at a time.
 # Ignores this rule for push events.
 concurrency:
-  group: ${{ github.event.pull_request.number || github.sha }}-xray
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-{{ github.ref }}
   cancel-in-progress: true
 jobs:
   CLI-Tests: