diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
index bfc618d021d..2077d20ff80 100644
--- a/.github/workflows/check-links.yaml
+++ b/.github/workflows/check-links.yaml
@@ -7,6 +7,7 @@ on:
   schedule:
     # Run on the first of each month at 9:00 AM (See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
     - cron: "0 9 1 * *"
+  workflow_dispatch:
 
 jobs:
   markdown-link-check:
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 485cbda548f..96c0b80503f 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -26,6 +26,10 @@ env:
   GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
   JAVA_OPTS: -Xmx4g
 
+concurrency:
+  group: ${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
@@ -45,10 +49,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
       - name: Fetch all history for all tags and branches
         uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index a9281f17b2f..bf04acc1d4c 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -6,6 +6,7 @@ on:
       - gource
   schedule:
     - cron:  '15 3 1 1,4,7,10 *'
+  workflow_dispatch:
 
 jobs:
   action:
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c190256444f..564ad5f0971 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -9,6 +9,10 @@ on:
    # run on each day
   - cron: "33 4 * * *"
 
+concurrency:
+  group: snap-${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
index 83ae6ef2685..f670c0ee1ab 100644
--- a/.github/workflows/tests-fetchers.yml
+++ b/.github/workflows/tests-fetchers.yml
@@ -27,6 +27,10 @@ env:
   AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
   IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}
 
+concurrency:
+  group: fetcher-tests-${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   fetchertests:
     name: Fetcher tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fe26e4e8fdc..ba680d86435 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,9 +3,11 @@ name: Tests
 on:
   push:
     branches:
-      - master
+      - main
+      - main-release
   pull_request:
     # always run on pull requests
+  workflow_dispatch:
 
 env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -14,15 +16,15 @@ env:
   GRADLE_OPTS: -Xmx4g
   JAVA_OPTS: -Xmx4g
 
+concurrency:
+  group: tests-${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   checkstyle:
     name: Checkstyle
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
       - name: Checkout source
         uses: actions/checkout@v2
       - name: Set up JDK