diff --git a/.github/workflows/marvin.yml b/.github/workflows/marvin.yml
index 5dde09a8e..ff750c340 100644
--- a/.github/workflows/marvin.yml
+++ b/.github/workflows/marvin.yml
@@ -36,9 +36,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get Marvin app token
-        id: mtoken
-        uses: tibdex/github-app-token@v2
+      - name: Generate Marvin App token
+        id: marvin-token
+        uses: actions/create-github-app-token@v1
         with:
           app_id: ${{ secrets.MARVIN_APP_ID }}
           private_key: ${{ secrets.MARVIN_APP_PRIVATE_KEY }}
@@ -55,7 +55,7 @@ jobs:
           (github.event_name == 'discussion_comment' && contains(github.event.comment.body, '/marvin'))
         uses: anthropics/claude-code-action@beta
         with:
-          github-token: ${{ steps.mtoken.outputs.token }}
+          github-token: ${{ steps.marvin-token.outputs.token }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           mode: tag
           trigger_phrase: "/marvin"
@@ -72,7 +72,7 @@ jobs:
           (github.event_name == 'discussion_comment' && contains(github.event.comment.body, '@Marvin Context Protocol'))
         uses: anthropics/claude-code-action@beta
         with:
-          github-token: ${{ steps.mtoken.outputs.token }}
+          github-token: ${{ steps.marvin-token.outputs.token }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           mode: tag
           trigger_phrase: "@Marvin Context Protocol"
@@ -84,7 +84,7 @@ jobs:
           (github.event_name == 'issues' && github.event.action == 'labeled' && github.event.label.name == 'marvin')
         uses: anthropics/claude-code-action@beta
         with:
-          github-token: ${{ steps.mtoken.outputs.token }}
+          github-token: ${{ steps.marvin-token.outputs.token }}
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           mode: tag
           assignee_trigger: "Marvin Context Protocol"