diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d573f578c6..8a6eb0406d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -35,9 +35,9 @@ jobs:
       - name: Prepare release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TYPE_ARG: ${{ fromJSON('{"auto":"", "patch":"--patch", "minor":"--minor", "major":"--major"}')[github.event.inputs.type] }}
+          TYPE_ARG: ${{ fromJSON('{"auto":"", "patch":"patch", "minor":"minor", "major":"major"}')[github.event.inputs.type] }}
           BETA_ARG: ${{ github.event.inputs.beta == 'true' && '--preRelease=beta' || '' }}
-        run: npm run release -- --ci --verbose --no-git.push --no-git.commit --no-git.tag --no-github $TYPE_ARG $BETA_ARG $DRY_ARG
+        run: npm run release -- $TYPE_ARG --ci --verbose --no-git.push --no-git.commit --no-git.tag --no-github $BETA_ARG $DRY_ARG
       - name: Show git status
         if: failure()
         run: git status && git diff
diff --git a/bin/contributors.js b/bin/contributors.js
index c7fe8a728d..fa88fd3b24 100644
--- a/bin/contributors.js
+++ b/bin/contributors.js
@@ -201,8 +201,12 @@ const renderPRsList = async (tag, template, {comments_threshold= 5, awesome_thre
 
       pr.messages = [];
 
-      if (body && (match = /```+changelog(.+)?```/gms.exec(body)) && match[1]) {
-        pr.messages.push(match[1]);
+      if (body) {
+        const reg = /```+changelog\n*(.+?)?\n*```/gms;
+
+        while((match = reg.exec(body))) {
+          match[1] && pr.messages.push(match[1]);
+        }
       }
     }
   }