diff --git a/.github/workflows/manual-release-major.yml b/.github/workflows/manual-release-major.yml
index 80afb226f8..497bc4da29 100644
--- a/.github/workflows/manual-release-major.yml
+++ b/.github/workflows/manual-release-major.yml
@@ -70,6 +70,23 @@ jobs:
       - name: Merge main into next
         shell: bash
         run: |
+          for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
+          do
+            cd ./packages/pro-plugins/@nocobase/$repo
+            git checkout main
+            git pull origin main
+            git checkout next
+            git pull origin next
+            git merge main
+            cd ../../../../
+          done
+          cd ./packages/pro-plugins
+          git checkout main
+          git pull origin main
+          git checkout next
+          git pull origin next
+          git merge main
+          cd ../../
           git checkout main
           git pull origin main
           git checkout next
@@ -78,6 +95,17 @@ jobs:
       - name: Merge next into main
         shell: bash
         run: |
+          for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
+          do
+            cd ./packages/pro-plugins/@nocobase/$repo
+            git checkout main
+            git merge next
+            cd ../../../../
+          done
+          cd ./packages/pro-plugins
+          git checkout main
+          git merge next
+          cd ../../
           git checkout main
           git merge next
       - name: Release major (main)
@@ -88,11 +116,22 @@ jobs:
         env:
           PRO_PLUGIN_REPOS: ${{ vars.NEXT_PRO_PLUGIN_REPOS }}
           CUSTOM_PRO_PLUGIN_REPOS: ${{ vars.CUSTOM_PRO_PLUGIN_REPOS }}
-      - name: Merge main into next(-X ours)
+      - name: Merge main into next
         shell: bash
         run: |
+          for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
+          do
+            cd ./packages/pro-plugins/@nocobase/$repo
+            git checkout next
+            git merge main
+            cd ../../../../
+          done
+          cd ./packages/pro-plugins
           git checkout next
-          git merge -X ours main --no-edit
+          git merge main
+          cd ../../
+          git checkout next
+          git merge main
       - name: Release major (next)
         shell: bash
         run: |
@@ -104,5 +143,16 @@ jobs:
       # - name: Push
       #   shell: bash
       #   run: |
+      #     for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
+      #     do
+      #       cd ./packages/pro-plugins/@nocobase/$repo
+      #       git push origin main --atomic --tags
+      #       git push origin next --atomic --tags
+      #       cd ../../../../
+      #     done
+      #     cd ./packages/pro-plugins
+      #     git push origin main --atomic --tags
+      #     git push origin next --atomic --tags
+      #     cd ../../
       #     git push origin main --atomic --tags
       #     git push origin next --atomic --tags