diff --git a/.github/workflows/command-rebase.yml b/.github/workflows/command-rebase.yml
index 80037056..a99b3d63 100644
--- a/.github/workflows/command-rebase.yml
+++ b/.github/workflows/command-rebase.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@v1
+        uses: peter-evans/create-or-update-comment@v2
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -31,13 +31,16 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.COMMAND_BOT_PAT }}
 
+      - name: Fix permissions
+        run: git config --global --add safe.directory /github/workspace
+
       - name: Automatic Rebase
         uses: cirrus-actions/rebase@1.5
         env:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@v1
+        uses: peter-evans/create-or-update-comment@v2
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}