diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
index 1968abe5..3379d197 100644
--- a/.github/workflows/fork-sync.yml
+++ b/.github/workflows/fork-sync.yml
@@ -38,12 +38,15 @@ jobs:
         run: |
           for TAG in ${NEW_TAGS}; do
             git checkout -b release/${TAG} ${TAG}
-            git rev-list --reverse main ^upstream/main | git cherry-pick --stdin
-            git tag -d ${TAG}
-            git tag ${TAG} release/${TAG}
+            git rev-list --no-merges --reverse main ^upstream/main | git cherry-pick --stdin
+          done
+          for TAG in ${NEW_TAGS}; do
+            git push -u origin release/${TAG}
+            gh release create ${TAG} --target release/${TAG} --generate-notes
           done
-          for TAG in ${NEW_TAGS}; do git push -u origin release/${TAG}; done
         env:
           NEW_TAGS: ${{inputs.tags || steps.fetch-upstream-tags.outputs.NEW_TAGS}}
+          GH_TOKEN: ${{secrets.HOMEPAGE_TOKEN}}
+
     env:
       GH_TOKEN: ${{ github.token }}