diff --git a/.github/workflows/auto_changelog.yml b/.github/workflows/auto_changelog.yml
index a7280acd15f..3921e7c573b 100644
--- a/.github/workflows/auto_changelog.yml
+++ b/.github/workflows/auto_changelog.yml
@@ -21,4 +21,4 @@ jobs:
         script: |
           const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')
           await processAutoChangelog({ github, context })
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 64d3a2c4669..06ab0da9770 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -3,16 +3,20 @@ on:
   push:
     branches:
     - master
+    - 'gh-readonly-queue/master/**'
   pull_request:
     branches:
     - master
+  merge_group:
+    branches:
+    - master
 jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
     runs-on: ubuntu-22.04
     concurrency:
-      group: run_linters-${{ github.ref }}
+      group: run_linters-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
@@ -58,7 +62,7 @@ jobs:
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
       - name: Annotate Lints
         uses: yogstation13/DreamAnnotate@v2
-        if: always()
+        if: success() || failure()
         with:
           outputFile: output-annotations.txt
 
@@ -86,7 +90,7 @@ jobs:
     outputs:
       maps: ${{ steps.map_finder.outputs.maps }}
     concurrency:
-      group: find_all_maps-${{ github.ref }}
+      group: find_all_maps-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
@@ -106,7 +110,7 @@ jobs:
       matrix:
         map: ${{ fromJSON(needs.find_all_maps.outputs.maps).paths }}
     concurrency:
-      group: run_all_tests-${{ github.ref }}-${{ matrix.map }}
+      group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.map }}
       cancel-in-progress: true
     uses: ./.github/workflows/run_unit_tests.yml
     with:
diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml
index f2a6449c4c4..1f6e7209262 100644
--- a/.github/workflows/compile_changelogs.yml
+++ b/.github/workflows/compile_changelogs.yml
@@ -51,4 +51,4 @@ jobs:
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: ad-m/github-push-action@master
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}