diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create_release_draft.yml
index 3800bdda520..78c3bf15a6e 100644
--- a/.github/workflows/create_release_draft.yml
+++ b/.github/workflows/create_release_draft.yml
@@ -75,21 +75,23 @@ jobs:
           sha256sum "${GRASS}.tar.xz" > "${GRASS}.tar.xz.sha256"
       - name: Publish draft distribution to GitHub (for tags only)
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
-        with:
-          name: GRASS ${{ github.ref_name }}
-          body: |
-            Overview of changes
-            - First change
-            - Second change
-          draft: true
-          prerelease: ${{ contains(github.ref, 'RC') }}
-          files: |
-              ${{ env.OUT_DIR }}/${{ env.GRASS }}.tar.gz
-              ${{ env.OUT_DIR }}/${{ env.GRASS }}.tar.gz.md5
-              ${{ env.OUT_DIR }}/${{ env.GRASS }}.tar.gz.sha256
-              ${{ env.OUT_DIR }}/${{ env.GRASS }}.tar.xz
-              ${{ env.OUT_DIR }}/${{ env.GRASS }}.tar.xz.md5
-              ${{ env.OUT_DIR }}/${{ env.GRASS }}.tar.xz.sha256
-              ${{ env.OUT_DIR }}/ChangeLog.gz
-              ${{ env.OUT_DIR }}/core_modules_with_last_commit.patch
+        run: |-
+          gh release create "${GITHUB_REF_NAME}" \
+            --draft \
+            --verify-tag \
+            --fail-on-no-commits \
+            --generate-notes \
+            --title "${TITLE}" \
+            --prerelease="${PRERELEASE_FLAG}" \
+            "${OUT_DIR}/${GRASS}.tar.gz" \
+            "${OUT_DIR}/${GRASS}.tar.gz.md5" \
+            "${OUT_DIR}/${GRASS}.tar.gz.sha256" \
+            "${OUT_DIR}/${GRASS}.tar.xz" \
+            "${OUT_DIR}/${GRASS}.tar.xz.md5" \
+            "${OUT_DIR}/${GRASS}.tar.xz.sha256" \
+            "${OUT_DIR}/ChangeLog.gz" \
+            "${OUT_DIR}/core_modules_with_last_commit.patch"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          TITLE: GRASS ${{ github.ref_name }}
+          PRERELEASE_FLAG: ${{ contains(github.ref, 'RC') }}