diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eda764d20..cccb626ac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,16 +20,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
+      # - name: Create Release (actions/create-release)
+      #   id: create_release
+      #   uses: actions/create-release@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      #   with:
+      #     tag_name: X.Y
+      #     release_name: X.Y
+      #     body: |
+      #       CHANGE 1; CHANGE 2.
+      #       https://hledger.org/release-notes.html#hledger-X-Y
+      #     draft: true
+      #     prerelease: true
+
+      - name: Create Release (softprops/action-gh-release)
+        uses: softprops/action-gh-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: X.Y
-          release_name: X.Y
-          body: |
-            CHANGE 1; CHANGE 2.
-            https://hledger.org/release-notes.html#hledger-X-Y
-          draft: true
-          prerelease: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: startsWith(github.ref, 'refs/tags/')