diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
index 1b9561f..93cd3d6 100644
--- a/.github/workflows/publish_pypi.yml
+++ b/.github/workflows/publish_pypi.yml
@@ -41,4 +41,5 @@ jobs:
     - name: Publish distribution 📦 to PyPI
       uses: pypa/gh-action-pypi-publish@master
       with:
+        user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/publish_pypi_test.yml b/.github/workflows/publish_pypi_test.yml
index 04d9ebc..0681bac 100644
--- a/.github/workflows/publish_pypi_test.yml
+++ b/.github/workflows/publish_pypi_test.yml
@@ -1,8 +1,8 @@
 name: Publish main branch to PyPi test
 
 on:
-  push:
-    branches: [ main ]
+  release:
+    types: [ created ]
 
 jobs:
   test:
@@ -76,5 +76,6 @@ jobs:
     - name: Publish distribution 📦 to Test PyPI
       uses: pypa/gh-action-pypi-publish@master
       with:
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN_TEST }}
         repository_url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/test_and_lint.yml b/.github/workflows/test_and_lint.yml
index d759178..3283f5d 100644
--- a/.github/workflows/test_and_lint.yml
+++ b/.github/workflows/test_and_lint.yml
@@ -3,8 +3,8 @@ name: Test and lint
 on:
   pull_request:
     branches: [ main ]
-  release:
-    types: [ created ]
+  push:
+    branches: [ main ]
 
 jobs:
   test: