diff --git a/.github/workflows/code-pull-request.yml b/.github/workflows/code-pull-request.yml
index e54203ce..8521abc4 100644
--- a/.github/workflows/code-pull-request.yml
+++ b/.github/workflows/code-pull-request.yml
@@ -16,8 +16,8 @@ permissions:
   pull-requests: write
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
   ARCHGATE_TELEMETRY: "0"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 135d7984..a970abf1 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -15,8 +15,8 @@ permissions:
   contents: read
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
   ARCHGATE_TELEMETRY: "0"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ceb547e1..8c0725ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -153,8 +153,6 @@ jobs:
       - name: Validate
         id: validate
         run: bun run validate
-      - name: Ensure main is up-to-date before release
-        run: git pull --rebase origin main
       - name: Release
         uses: TrigenSoftware/simple-release-action@e7293dad843693d8692d443c3f21b78338048f13 # v1.1.8
         with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9d3ebf13..220ad15b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -12,8 +12,8 @@ on:
 permissions: read-all
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.sha }}
+  cancel-in-progress: false
 
 jobs:
   analysis: