diff --git a/.cruft.json b/.cruft.json
index 63eea24d57..28cc085e46 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/vshn/appcat-cookiecutter",
-  "commit": "725bf3a6fc6bd3729f02fd25dd04d93af597fdda",
+  "commit": "8f29fab7ec7458dacdc42e208806c5669162d87f",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -15,7 +15,7 @@
         ".github/changelog-configuration.json"
       ],
       "_template": "https://github.com/vshn/appcat-cookiecutter",
-      "_commit": "725bf3a6fc6bd3729f02fd25dd04d93af597fdda"
+      "_commit": "8f29fab7ec7458dacdc42e208806c5669162d87f"
     }
   },
   "directory": null
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index d4d22bf7e4..c1f38a4c24 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -11,6 +11,8 @@ env:
 jobs:
   create-and-merge-appcat-pr:
     runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     outputs:
       new_tag: ${{ steps.bump.outputs.new_tag }}
     steps:
@@ -70,7 +72,7 @@ jobs:
       - name: Merge PR
         run: gh pr merge ${{ steps.pr_info.outputs.pr_number }} --merge
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.MERGE_TOKEN }}
 
       - name: Bump minor version and tag
         id: bump
@@ -87,6 +89,8 @@ jobs:
   create-component-release-pr:
     needs: create-and-merge-appcat-pr
     runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.COMPONENT_ACCESS_TOKEN }}
     steps:
       - name: Clone component repo
         uses: actions/checkout@v4