diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
index 12a8e62d4..c3349b75a 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -21,3 +21,5 @@ jobs:
         name: Publish package distributions to TestPyPI
         with:
           repository-url: https://test.pypi.org/legacy/
+          # See https://github.com/pypa/gh-action-pypi-publish#tolerating-release-package-file-duplicates
+          skip-existing: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a1ba59057..b5579d666 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,9 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v3
 
@@ -25,6 +28,4 @@ jobs:
             dist/databricks-*.tar.gz
 
       - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
+        name: Publish package distributions to PyPI