diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
index 71f2113aa..05f6f9667 100644
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -46,9 +46,13 @@ jobs:
         run: poetry build
       - name: Publish to PyPI
         if: startsWith(github.ref, 'refs/tags/v')
-        run: poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }}
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: poetry publish -u __token__ -p "$PYPI_TOKEN"
       - name: Publish to TestPyPI
         if: "!startsWith(github.ref, 'refs/tags/v')"
+        env:
+          TEST_PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }}
         run: |
           poetry config repositories.test-pypi https://test.pypi.org/legacy/
-          poetry publish -r test-pypi -u __token__ -p ${{ secrets.TEST_PYPI_TOKEN }}
+          poetry publish -r test-pypi -u __token__ -p "$TEST_PYPI_TOKEN"