diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6db41b3..078972b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -71,7 +71,7 @@ jobs:
     - name: Create Release
       uses: softprops/action-gh-release@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PAT }}
       with:
         name: pve-edge-kernel ${{ steps.format_release.outputs.release }}
         body: ${{ steps.format_release.outputs.changelog }}
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index c98dd6c..ce9bde5 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -22,11 +22,6 @@ jobs:
       uses: actions/checkout@v2
       with:
           submodules: recursive
-    - uses: tibdex/github-app-token@v1
-      id: generate-token
-      with:
-        app_id: ${{ secrets.APP_ID }}
-        private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Setup System Dependencies
       run: sudo apt install devscripts
     - name: Update Kernel
@@ -45,16 +40,16 @@ jobs:
         changelog="${changelog//$'\n'/'%0A'}"
         changelog="${changelog//$'\r'/'%0D'}"
         echo "::set-output name=changelog::$changelog"
-        echo "::set-output name=base::$(scripts/version.sh -B)"
         echo "::set-output name=branch::${GITHUB_REF##*/}"
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v3
       with:
-        token: ${{ steps.generate-token.outputs.token }} # Custom token needed to recursively trigger workflows
+        token: ${{ secrets.PAT }} # Custom token needed to recursively trigger workflows
+        author: Fabian Mastenbroek <mail.fabianm@gmail.com>
         commit-message: |
           Add Linux ${{ steps.update.outputs.version }}
 
-          This change updates the kernel to Linux ${{ steps.update.outputs.version }} based on Ubuntu ${{ steps.update.outputs.base }}.
+          This change updates the kernel to Linux ${{ steps.update.outputs.version }}.
         branch: staging/v${{ steps.update.outputs.full }}
         branch-suffix: short-commit-hash
         delete-branch: true
diff --git a/.github/workflows/watch.yml b/.github/workflows/watch.yml
index adb7574..0492fbd 100644
--- a/.github/workflows/watch.yml
+++ b/.github/workflows/watch.yml
@@ -17,11 +17,6 @@ jobs:
       uses: actions/checkout@v2
       with:
         ref: ${{ matrix.branch }}
-    - uses: tibdex/github-app-token@v1
-      id: generate-token
-      with:
-        app_id: ${{ secrets.APP_ID }}
-        private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Setup System Dependencies
       run: sudo apt install jq curl
     - name: Check for Release
@@ -45,7 +40,7 @@ jobs:
       uses: benc-uk/workflow-dispatch@v1
       with:
         workflow: Kernel Update
-        token: ${{ steps.generate-token.outputs.token }} # Custom token needed to recursively trigger workflows
-        inputs: '{ "tag": "cod/mainline/v${{ steps.check.outputs.version }}" }'
+        token: ${{ secrets.PAT }} # Custom token needed to recursively trigger workflows
+        inputs: '{ "tag": "v${{ steps.check.outputs.version }}" }'
         ref: ${{ matrix.branch }}