diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1190d301..d6d04dbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,19 +102,17 @@ jobs:
               build/dfetch-package/*.msi
               build/dfetch-package/*.cdx.json
 
-      - name: Upload installer to release
+      - name: Upload installer to release ⬆️
         if: ${{ inputs.release_id }}
-        uses: softprops/action-gh-release@5122b4edc95f85501a71628a57dc180a03ec7588 # v2.5.0
-        with:
-          tag_name: ${{ inputs.release_id }}
-          files: |
-              build/dfetch-package/*.deb
-              build/dfetch-package/*.rpm
-              build/dfetch-package/*.pkg
-              build/dfetch-package/*.msi
-              build/dfetch-package/*.cdx.json
-          draft: true
-          preserve_order: true
+        shell: bash
+        run: gh release upload               \
+             "${{ inputs.release_id }}"      \
+             build/dfetch-package/*.deb      \
+             build/dfetch-package/*.rpm      \
+             build/dfetch-package/*.pkg      \
+             build/dfetch-package/*.msi      \
+             build/dfetch-package/*.cdx.json \
+             --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -213,12 +211,7 @@ jobs:
       with:
         name: python-package-distributions
         path: dist/
-    - name: Upload artifacts to release
-      uses: softprops/action-gh-release@5122b4edc95f85501a71628a57dc180a03ec7588 # v2.5.0
-      with:
-        tag_name: ${{ inputs.release_id }}
-        files: dist/*
-        draft: true
-        preserve_order: true
+    - name: Upload artifacts to release ⬆️
+      run: gh release upload "${{ inputs.release_id }}" dist/* --clobber
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4278b944..c76b130d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,10 +24,13 @@ jobs:
       - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
           python-version: '3.13'
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Determine release info
         id: release_info
@@ -75,14 +78,16 @@ jobs:
             echo "No release found for $TAG."
           fi
 
-      - name: Create release
+      # Note that since this is a draft the link will be untagged (see https://github.com/cli/cli/issues/11589)
+      - name: Create draft release
         if: ${{ steps.release_info.outputs.tag }}
-        uses: softprops/action-gh-release@5122b4edc95f85501a71628a57dc180a03ec7588 # v2.5.0
-        with:
-          tag_name: ${{ steps.release_info.outputs.tag }}
-          name: ${{ steps.release_info.outputs.tag }}
-          body_path: release_notes.txt
-          draft: true
-          files: LICENSE
+        run: |
+          gh release create "${{ steps.release_info.outputs.tag }}" \
+            --repo "$GITHUB_REPOSITORY"                             \
+            --title "${{ steps.release_info.outputs.tag }}"         \
+            --notes-file release_notes.txt                          \
+            --draft                                                 \
+            --verify-tag                                            \
+            LICENSE
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}