diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3787ce..78aaee0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,14 @@ name: Build
 
 on:
   workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to build'
+        required: true
+        type: choice
+        options:
+          - master
+          - refs/remotes/**
   push:
     branches:
       - develop/*
@@ -146,6 +154,9 @@ jobs:
     name: Deploy packages
     runs-on: ubuntu-latest
     needs: test-wheels
+    permissions:
+      id-token: write
+      contents: read
 
     steps:
       - name: Setup Python ${{ matrix.python-version }}
@@ -159,7 +170,9 @@ jobs:
           path: dist
 
       - name: Install twine
-        run: pip install twine
+        run: |
+          pip install twine
+          pip install -U packaging
 
       - name: Move files to top level directory
         run: |
@@ -180,14 +193,8 @@ jobs:
 
       - name: Upload packages to testpypi
         if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_TEST_TOKEN_NAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }}
         run: python -m twine upload --skip-existing --repository testpypi dist/* --verbose
 
       - name: Upload packages to pypi
         if: startsWith(github.ref, 'refs/tags/')
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_PROD_TOKEN_NAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PROD_API_TOKEN }}
         run: python -m twine upload --skip-existing dist/* --verbose
diff --git a/setup.cfg b/setup.cfg
index 2f75d3e..f83af33 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,4 +34,4 @@ classifiers =
     Topic :: Scientific/Engineering
 
 [options]
-python_requires = >= 3.8
+python_requires = >= 3.9