diff --git a/.github/workflows/onpush_superlinter.yml b/.github/workflows/onpush_superlinter.yml
index 71cc13aa9..5fa2240f7 100644
--- a/.github/workflows/onpush_superlinter.yml
+++ b/.github/workflows/onpush_superlinter.yml
@@ -61,16 +61,11 @@ jobs:
       - name: Remove Super-Linter output (prevent checkout conflict)
         run: sudo rm -rf super-linter-output/
 
-      - name: Pull latest changes to avoid non-fast-forward push errors
-        run: |
-          git config --global user.name "github-actions"
-          git config --global user.email "github-actions@github.com"
-          git fetch origin master
-          git pull --rebase origin master
-
-      - name: Commit and push linting fixes
-        uses: stefanzweifel/git-auto-commit-action@v5
+      - name: Commit if needed
+        uses: EndBug/add-and-commit@v9
         with:
-          commit_message: "chore: fix linting issues"
-          commit_user_name: "github-actions"
-          commit_user_email: "github-actions@github.com"
+          commit: -u
+          message: "GitHub bot: fix linting issues"
+          default_author: github_actions
+          pull: --rebase --autostash
+          fetch: --tags --force