diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml
index a50b1c3c..2d2fdeb4 100644
--- a/.github/workflows/renovate-rebase.yaml
+++ b/.github/workflows/renovate-rebase.yaml
@@ -52,12 +52,14 @@ jobs:
           # echo "CURRENT_PR_SHA=$(git rev-parse --verify HEAD)" >> "${GITHUB_ENV}"
           git remote add upstream https://github.com/${{ github.event.pull_request.base.repo.full_name }}
           git pull --no-edit upstream ${{ github.event.pull_request.base.ref }}
+          git reset --soft ${{ github.event.pull_request.head.sha }} # so the rev-parse in API commit gets the right SHA
 
       - name: Commit Changes
         env:
           GITHUB_TOKEN: "${{ steps.oauth-token.outputs.token }}"
           DESTINATION_BRANCH: "${{ github.event.pull_request.head.ref }}"
         run: |
+          shopt -s nullglob
           export TODAY=$( date -u '+%Y-%m-%d_%H-%M-%S' )
           export MESSAGE="chore: update ${{ github.event.pull_request.head.ref }} $TODAY"
           echo "Branch to update: $DESTINATION_BRANCH"
@@ -73,5 +75,4 @@ jobs:
               --field encoding="base64" \
               --field branch="$DESTINATION_BRANCH" \
               --field sha="$SHA" \
-              || echo "No changes to push"
           done