diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0c5d0fd..987d9f3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,4 +27,4 @@ jobs:
         uses: mikeal/merge-release@master
         env:
           GITHUB_TOKEN: ${{ secrets.node_github_token }}
-          NODE_AUTH_TOKEN: ${{ secrets.npm_token }}
+          NPM_AUTH_TOKEN: ${{ secrets.npm_token }}
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index d5f83ca..dddc84b 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -2,15 +2,25 @@
 name: Automatic Rebase
 on:
   issue_comment:
-    types: [created]
+    types:
+      - created
 jobs:
   rebase:
     name: Rebase
-    if: contains(github.event.comment.body, '/rebase')
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 0
       - name: Automatic Rebase
-        uses: cirrus-actions/rebase@master
+        uses: cirrus-actions/rebase@1.2
         env:
           GITHUB_TOKEN: ${{ secrets.node_github_token }}
+  # https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250
+  always_job:
+    name: Always run job
+    runs-on: ubuntu-latest
+    steps:
+      - name: Always run
+        run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped."