diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5327c72..e8f864b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,25 +26,22 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
           DEFAULT_BUMP: patch
+          PRERELEASE: false
+          DEFAULT_BRANCH: rolling
       - name: Changelog
         uses: scottbrenner/generate-changelog-action@master
         id: Changelog
         env:
           REPO: ${{ github.repository }}
       - name: Create Release
-        id: create_release
-        uses: actions/create-release@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PRERELEASE: false
-          RELEASE_BRANCHES: rolling,stable
-          PRERELEASE_SUFFIX: ''
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
         with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          generate_release_notes: true
+          name: ${{ steps.version-bump.outputs.new_tag }}
           tag_name: ${{ steps.version-bump.outputs.new_tag }}
-          release_name: ${{ steps.version-bump.outputs.new_tag }}
-          body: |
-            ${{ steps.Changelog.outputs.changelog }}
-          
-          draft: false
           prerelease: false
+        env:
+          GITHUB_REPOSITORY: my_gh_org/my_gh_repo