diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 32cb12fb49..6b023ff699 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -9,20 +9,21 @@ jobs:
   set-auto-merge:
     runs-on: ubuntu-latest
     environment: master
+    timeout-minutes: 10
     # Important! This forces the job to run only on comments on Pull Requests that starts with '/merge'
     if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/merge') }}
     steps:
       - name: Get the GitHub handle of the fellows
-        uses: paritytech/get-fellows-action@v1.0.0
+        uses: paritytech/get-fellows-action@v1.1.0
         id: fellows
-      - name: Generate token
+      - name: Generate a token
         id: merge_token
-        uses: tibdex/github-app-token@v1
+        uses: actions/create-github-app-token@v1.8.1
         with:
-          app_id: ${{ secrets.MERGE_APP_ID }}
-          private_key: ${{ secrets.MERGE_APP_KEY }}
+          app-id: ${{ secrets.MERGE_APP_ID }}
+          private-key: ${{ secrets.MERGE_APP_KEY }}
       - name: Set auto merge
-        uses: paritytech/auto-merge-bot@v1.0.0
+        uses: paritytech/auto-merge-bot@v1.0.1
         with:
           GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
           MERGE_METHOD: "SQUASH"