diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d2c04dfc..29013475 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,13 +7,14 @@ name: Release
 
 on:
   push:
-    #    branches:
-    #      - main
-    #      - master
-    tags:
-      - '*'
-  pull_request:
+    branches: 
+      - main
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Semantic version for PyPI release (tag will share the same name)'
+        required: true
+        default: 'v0.1.0'
 
 permissions:
   contents: read
@@ -160,8 +161,8 @@ jobs:
   release-pypi:
     name: Release PyPi
     runs-on: ubuntu-latest
-    if: false # ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
-    needs: [linux, musllinux, windows, macos, sdist]
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [github-release]
     permissions:
       # Use to sign the release artifacts
       id-token: write
@@ -169,6 +170,7 @@ jobs:
       contents: write
       # Used to generate artifact attestation
       attestations: write
+    environment: release
     steps:
       - uses: actions/download-artifact@v4
       - name: Generate artifact attestation
@@ -176,25 +178,21 @@ jobs:
         with:
           subject-path: 'wheels-*/*'
       - name: Publish to PyPI
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
         with:
           command: upload
           args: --non-interactive --skip-existing wheels-*/*
 
-  release-github:
-    name: Release GitHub
+  github-release:
+    name: Create GitHub release
     runs-on: ubuntu-latest
     permissions:
       contents: write
-    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.event_name == 'workflow_dispatch' }}
     needs: [ linux, musllinux, windows, macos, sdist ]
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
-      - name: Publish to GitHub Releases
-        env:
-          GH_TOKEN: ${{ github.token }}
+      - name: Create GitHub Release
         run: |
-          gh release upload ${{github.event.release.tag_name}} wheels-*/*
+          gh release create ${{ github.event.inputs.tag}} wheels-*/* --generate-notes --draft --prerelease
diff --git a/hf_xet/Cargo.toml b/hf_xet/Cargo.toml
index f3f49df2..f6738503 100644
--- a/hf_xet/Cargo.toml
+++ b/hf_xet/Cargo.toml
@@ -2,6 +2,7 @@
 name = "hf_xet"
 version = "0.1.0"
 edition = "2021"
+license = "Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
diff --git a/hf_xet/pyproject.toml b/hf_xet/pyproject.toml
index c42a592a..21ee9ba8 100644
--- a/hf_xet/pyproject.toml
+++ b/hf_xet/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["maturin>=1.7,<2.0"]
 build-backend = "maturin"
 
 [project]
-name = "hfxet"
+name = "hf-xet"
 requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Rust",