diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
index 4caae23b..18a65e7a 100644
--- a/.github/workflows/publish_pypi.yml
+++ b/.github/workflows/publish_pypi.yml
@@ -1,5 +1,7 @@
 name: Publish Python 🐍 distributions 📦 to PyPI
-on: push
+on:
+  push:
+    branches: [main]
 
 jobs:
   build-n-publish:
@@ -23,8 +25,9 @@ jobs:
           user: dcambie
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
+          skip_existing: true
       - name: Publish distribution 📦 to PyPI
-        if: startsWith(github.ref, 'refs/tags')
+        if: startsWith(github.ref, 'refs/tags/releases/')
         uses: pypa/gh-action-pypi-publish@master
         with:
           user: __token__