diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml
index f6d8cee1e0d..b518eb90acd 100644
--- a/.github/workflows/ci_tests_dev.yaml
+++ b/.github/workflows/ci_tests_dev.yaml
@@ -57,21 +57,12 @@ jobs:
           # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
-      # Generate token from GenericMappingTools bot
-      - name: Generate token from GenericMappingTools bot
-        uses: tibdex/github-app-token@v2
-        if: github.event_name == 'repository_dispatch'
-        id: generate-token
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       # Checkout the pull request branch
       - name: Checkout
         uses: actions/checkout@v4.1.1
         if: github.event_name == 'repository_dispatch'
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
           ref: ${{ github.event.client_payload.pull_request.head.ref }}
           # fetch all history so that setuptools-scm works
@@ -79,9 +70,9 @@ jobs:
 
       - name: Show job URL
         uses: peter-evans/create-or-update-comment@v3.1.0
-        if: github.event_name == 'repository_dispatch' && (matrix.os == 'ubuntu-latest')
+        if: github.event_name == 'repository_dispatch' && runner.os == 'Linux'
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
           comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
           body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
diff --git a/.github/workflows/slash-command-dispatch.yml b/.github/workflows/slash-command-dispatch.yml
index 9762c56138d..ac7e4df9933 100644
--- a/.github/workflows/slash-command-dispatch.yml
+++ b/.github/workflows/slash-command-dispatch.yml
@@ -13,17 +13,10 @@ jobs:
     if: ${{ github.event.issue.pull_request }}
     runs-on: ubuntu-latest
     steps:
-      # Generate token from GenericMappingTools bot
-      - uses: tibdex/github-app-token@v2
-        id: generate-token
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Slash Command Dispatch
         uses: peter-evans/slash-command-dispatch@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           commands: |
             format
             test-gmt-dev