diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8f895adaf..7cbfd7ce5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,6 +9,11 @@ on:
 jobs:
   pypi:
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/maestral
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5.0.0
@@ -20,10 +25,12 @@ jobs:
           python -m pip install --upgrade pip
           pip install build twine
 
-      - name: Build and publish
+      - name: Build
         run: |
           python -m build
-          twine upload dist/* --skip-existing
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
 
   docker-hub:
     runs-on: ubuntu-latest