diff --git a/.github/workflows/wangamail-csharp.yml b/.github/workflows/wangamail-csharp.yml
index 92f4a7e..5bf94a7 100644
--- a/.github/workflows/wangamail-csharp.yml
+++ b/.github/workflows/wangamail-csharp.yml
@@ -155,7 +155,15 @@ jobs:
             git commit -m "chore(wangamail-csharp): bump version to ${{ steps.bump.outputs.new_version }} [skip ci]"
             git fetch origin main || true
             git pull origin main --rebase || git pull origin main --no-rebase || true
-            git push origin main || git push origin main --force-with-lease
+            # Retry push to avoid stale-ref/lock failures when remote updates
+            for _ in 1 2 3; do
+              if git push origin main; then
+                break
+              fi
+              git fetch origin main || true
+              git pull origin main --rebase || git pull origin main --no-rebase || true
+              git push origin main --force-with-lease || true
+            done
           fi
 
       - name: Job summary
diff --git a/.github/workflows/wangamail-rs.yml b/.github/workflows/wangamail-rs.yml
index ea21912..1baecf8 100644
--- a/.github/workflows/wangamail-rs.yml
+++ b/.github/workflows/wangamail-rs.yml
@@ -279,7 +279,15 @@ jobs:
             # Sync with remote main to avoid non-fast-forward push failures
             git fetch origin main || true
             git pull origin main --rebase || git pull origin main --no-rebase || true
-            git push origin main || git push origin main --force-with-lease
+            # Retry push to avoid stale-ref/lock failures when remote updates
+            for _ in 1 2 3; do
+              if git push origin main; then
+                break
+              fi
+              git fetch origin main || true
+              git pull origin main --rebase || git pull origin main --no-rebase || true
+              git push origin main --force-with-lease || true
+            done
           fi
 
       - name: Job summary
diff --git a/.github/workflows/wangapayfast-csharp.yml b/.github/workflows/wangapayfast-csharp.yml
index 0d16ae6..fadbd4b 100644
--- a/.github/workflows/wangapayfast-csharp.yml
+++ b/.github/workflows/wangapayfast-csharp.yml
@@ -148,7 +148,15 @@ jobs:
             git commit -m "chore(wangapayfast-csharp): bump version to ${{ steps.bump.outputs.new_version }} [skip ci]"
             git fetch origin main || true
             git pull origin main --rebase || git pull origin main --no-rebase || true
-            git push origin main || git push origin main --force-with-lease
+            # Retry push to avoid stale-ref/lock failures when remote updates
+            for _ in 1 2 3; do
+              if git push origin main; then
+                break
+              fi
+              git fetch origin main || true
+              git pull origin main --rebase || git pull origin main --no-rebase || true
+              git push origin main --force-with-lease || true
+            done
           fi
 
       - name: Job summary
diff --git a/.github/workflows/wangapayfast-rs.yml b/.github/workflows/wangapayfast-rs.yml
index 1e15b9c..2d7b56f 100644
--- a/.github/workflows/wangapayfast-rs.yml
+++ b/.github/workflows/wangapayfast-rs.yml
@@ -341,7 +341,15 @@ jobs:
             # Sync with remote main to avoid non-fast-forward push failures
             git fetch origin main || true
             git pull origin main --rebase || git pull origin main --no-rebase || true
-            git push origin main || git push origin main --force-with-lease
+            # Retry push to avoid stale-ref/lock failures when remote updates
+            for _ in 1 2 3; do
+              if git push origin main; then
+                break
+              fi
+              git fetch origin main || true
+              git pull origin main --rebase || git pull origin main --no-rebase || true
+              git push origin main --force-with-lease || true
+            done
           fi
 
       - name: Job summary