diff --git a/.github/workflows/code_analysis.yml b/.github/workflows/code_analysis.yml
index c944c9a1bc..8c5d325b11 100644
--- a/.github/workflows/code_analysis.yml
+++ b/.github/workflows/code_analysis.yml
@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: '25 18 * * 2'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/pytest-auth.yml b/.github/workflows/pytest-auth.yml
index d45db0ac91..3b8c10c250 100644
--- a/.github/workflows/pytest-auth.yml
+++ b/.github/workflows/pytest-auth.yml
@@ -14,7 +14,21 @@
 name: Testing platform auth
 
 # Determine what events are going to trigger a running of the workflow
-on: [pull_request]
+on:
+  workflow_dispatch:
+  push:
+    branches:
+    - develop
+    - releases/**
+  pull_request:
+    branches:
+      - main
+      - develop
+      - releases/**
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   # The job named build
diff --git a/.github/workflows/pytest-dbutils-backup_db.yml b/.github/workflows/pytest-dbutils-backup_db.yml
index 865c197ae6..beecf28097 100644
--- a/.github/workflows/pytest-dbutils-backup_db.yml
+++ b/.github/workflows/pytest-dbutils-backup_db.yml
@@ -15,15 +15,20 @@ name: Testing BackupDatabase
 
 # Determine what events are going to trigger a running of the workflow
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
+      - main
+      - develop
+      - releases/**
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
diff --git a/.github/workflows/pytest-dbutils-influxdbfuncts.yml b/.github/workflows/pytest-dbutils-influxdbfuncts.yml
index 50f6ee79bd..ff3dcc5552 100644
--- a/.github/workflows/pytest-dbutils-influxdbfuncts.yml
+++ b/.github/workflows/pytest-dbutils-influxdbfuncts.yml
@@ -7,15 +7,19 @@
 
 name: Testing influxdbutils
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
diff --git a/.github/workflows/pytest-dbutils-mysqlfuncts.yml b/.github/workflows/pytest-dbutils-mysqlfuncts.yml
index 0186950c48..37e3068ffc 100644
--- a/.github/workflows/pytest-dbutils-mysqlfuncts.yml
+++ b/.github/workflows/pytest-dbutils-mysqlfuncts.yml
@@ -7,15 +7,19 @@
 
 name: Testing mysqlfuncts
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
diff --git a/.github/workflows/pytest-dbutils-postgresqlfuncts.yml b/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
index 2055564433..0398771cdb 100644
--- a/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
+++ b/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
@@ -7,15 +7,19 @@
 
 name: Testing postgresqlfuncts
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
diff --git a/.github/workflows/pytest-dbutils-sqlitefuncts.yml b/.github/workflows/pytest-dbutils-sqlitefuncts.yml
index 5fa741211f..3848e6efa8 100644
--- a/.github/workflows/pytest-dbutils-sqlitefuncts.yml
+++ b/.github/workflows/pytest-dbutils-sqlitefuncts.yml
@@ -7,16 +7,19 @@
 
 name: Testing sqlitefuncts
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
-
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     env:
diff --git a/.github/workflows/pytest-dbutils-timescaldbfuncts.yml b/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
index ea12f81333..1aeb461487 100644
--- a/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
+++ b/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
@@ -7,16 +7,19 @@
 
 name: Testing postgresql_timescaledb_functs
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
-
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     env:
diff --git a/.github/workflows/pytest-miscellaneous-tests.yml b/.github/workflows/pytest-miscellaneous-tests.yml
index 1e4e39ebc7..05da32d6bc 100644
--- a/.github/workflows/pytest-miscellaneous-tests.yml
+++ b/.github/workflows/pytest-miscellaneous-tests.yml
@@ -14,16 +14,19 @@
 name: Miscellaneous platform tests
 
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
-  
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   # The job named build
   build:
@@ -32,10 +35,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Each entry in the os and python-version matrix will be run 
+        # Each entry in the os and python-version matrix will be run
         os: [ ubuntu-20.04 ]
         python-version: [ 3.8 ]
-    
+
     # Run-on determines the operating system available to run on
     # - At the current time there is only ubuntu machine 20.04 available
     # - This uses the matrix os from the strategy above
@@ -60,7 +63,7 @@ jobs:
           os: ${{ matrix.os }}
           test_path: volttrontesting/platform/web/test_certs.py
           test_output_suffix: misc
-      
+
       - name: Run core agent test on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v5
         with:
@@ -84,7 +87,7 @@ jobs:
           os: ${{ matrix.os }}
           test_path: volttrontesting/platform/test_platform_init.py
           test_output_suffix: misc
-      
+
       - name: Run sqlite3 test on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v5
         with:
diff --git a/.github/workflows/pytest-testutils.yml b/.github/workflows/pytest-testutils.yml
index 713ffd4f39..39cebe91aa 100644
--- a/.github/workflows/pytest-testutils.yml
+++ b/.github/workflows/pytest-testutils.yml
@@ -9,16 +9,19 @@
 
 name: Testing testutils directory
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
-
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     # The strategy allows customization of the build and allows matrixing the version of os and software
diff --git a/.github/workflows/pytest-vctl.yml b/.github/workflows/pytest-vctl.yml
index b10c96613f..d0d5d868fb 100644
--- a/.github/workflows/pytest-vctl.yml
+++ b/.github/workflows/pytest-vctl.yml
@@ -15,16 +15,19 @@ name: Testing volttron-ctl
 
 # Determine what events are going to trigger a running of the workflow
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
-
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   # The job named build
   build:
@@ -71,4 +74,3 @@ jobs:
           name: pytest-report
           # should match test-<test_output_suffix>- ...
           path: output/test-control_tests-${{matrix.os}}-${{ matrix.python-version }}-results.xml
-
diff --git a/.github/workflows/pytest-web.yml b/.github/workflows/pytest-web.yml
index f1ea10838c..43b0540aa4 100644
--- a/.github/workflows/pytest-web.yml
+++ b/.github/workflows/pytest-web.yml
@@ -14,16 +14,19 @@
 name: Testing platform web
 
 on:
+  workflow_dispatch:
   push:
     branches:
     - develop
     - releases/**
   pull_request:
     branches:
-    - main
-    - develop
-    - releases/**
-
+      - main
+      - develop
+      - releases/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   # The job named build
   build:
@@ -68,15 +71,15 @@ jobs:
         with:
           name: pytest-report
           path: output/test-web-${{matrix.os}}-${{ matrix.python-version }}-results.xml
-    
+
 #       - name: Publish Unit Test Results
 #         uses: EnricoMi/publish-unit-test-result-action@v1.5
 #         if: always()
 #         with:
 #           github_token: ${{ secrets.WORKFLOW_ACCESS_TOKEN }}
 #           files: output/test-testutils*.xml
-          
-          
+
+
 #-cov=com --cov-report=xml --cov-report=html
 # pytest tests.py --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html
 #    - name: Lint with flake8