diff --git a/.github/workflows/rename-module.yml b/.github/workflows/rename-module.yml
index b2ccc20714b4..e4728984b756 100644
--- a/.github/workflows/rename-module.yml
+++ b/.github/workflows/rename-module.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       source_commit: "${{ inputs.source_commit || '2bd6bd01d2e8561dd7fc21b631f4a34ac16627a1' }}"
       # env variables cannot reference others so we have to duplicate the ||
-      output_branch: "${{ github.ref_name }}_auto-rename-module-${{ inputs.source_commit || '2bd6bd01d2e8561dd7fc21b631f4a34ac16627a1' }}"
+      output_branch: "${{ github.ref_name }}_auto-rename-module-${{ inputs.source_commit || '2bd6bd01d2e8561dd7fc21b631f4a34ac16627a1' }}_workflow-${{ hashFiles('.github/workflows/rename-module.yml') }}"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -60,13 +60,17 @@ jobs:
           go build ./...;
           go test ./accounts/abi/bind ./rlp/rlpgen
 
+      - name: Create new branch
+        run: git branch "${{ env.output_branch }}" "${{ github.ref }}"
+
       - name: Commit to new branch
-        uses: devops-infra/action-commit-push@8bc2ff9f9de7aa2a7581fc7e5b6401c04cab54c7
+        uses: planetscale/ghcommit-action@v0.2.0
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          target_branch: ${{ env.output_branch }}
-          force: true
-          commit_prefix: "[AUTO] rename Go module + update internal import paths"
+          commit_message: "[AUTO] rename Go module + update internal import paths"
+          repo: ${{ github.repository }}
+          branch: ${{ env.output_branch }}
 
       - name: Open PR to "renamed-go-module" iff workflow dispatched on "main"
         # If we are changing the way in which we manage module renaming then it