diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index cebe0b4..140dfe4 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -55,8 +55,14 @@ jobs:
   upload_all:
     name: Publish build distributions
     needs: [build_sdist_wheels]
+    if: github.event_name == 'push' && github.ref_type == 'tag'
     runs-on: ubuntu-latest
     steps:
-    - uses: neuroinformatics-unit/actions/upload_pypi@v2
+    - uses: actions/download-artifact@v4
+      with:
+        name: artifact
+        path: dist
+    - uses: pypa/gh-action-pypi-publish@v1.12.3
       with:
-        secret-pypi-key: ${{ secrets.TWINE_API_KEY }}
+        user: __token__
+        password: ${{ secrets.TWINE_API_KEY }}