diff --git a/.github/workflows/ChangelogUpdater.yml b/.github/workflows/ChangelogUpdater.yml
index 0c1b2109f..0ce72c4f9 100755
--- a/.github/workflows/ChangelogUpdater.yml
+++ b/.github/workflows/ChangelogUpdater.yml
@@ -1,7 +1,5 @@
 name: Changelog Updater
 on:
-  pull_request:
-    types: [opened]
   issue_comment:
     types: [created]
 
@@ -9,17 +7,25 @@ jobs:
   update-changelog:
     runs-on: macos-latest
     steps:
-      - uses: khan/pull-request-comment-trigger@master
+      - name: Check trigger
         id: check
+        uses: khan/pull-request-comment-trigger@master
         with:
           trigger: '\changelog-update'
           reaction: rocket
+          prefix_only: 'true'
         env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
       - name: Clone git repo
+        if: steps.check.outputs.triggered == 'true'
         uses: actions/checkout@v2
+      - name: Checkout pull request
         if: steps.check.outputs.triggered == 'true'
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: hub pr checkout ${{github.event.issue.number}}
       - name: Configure Git Agent
+        if: steps.check.outputs.triggered == 'true'
         run: |
           git config --global user.name 'Changelog Bot'
           git config --global user.email 'changelog-bot@users.noreply.github.com'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 67f7be0d7..9e62f3690 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,4 +13,4 @@ For bugs, it's good to provide some step-by-step instructions to reproduce the i
 ### When you open a pull request
 
 All PRs are very welcome, and we'll do our best to review them as fast as possible.
-Check the [development](DEVELOPMENT.md) instructions to understand how to setup a developer's environment, build and test Time to Leave.
+Check the [development](DEVELOPMENT.md) instructions to understand how to setup a developer's environment, build and test Time to Leave. Please enable `Allow edits by maintainers` when raising the PR.