diff --git a/.github/workflows/pypi-publish.yaml b/.github/workflows/pypi-publish.yaml
new file mode 100644
index 0000000..4a4971a
--- /dev/null
+++ b/.github/workflows/pypi-publish.yaml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Publish to PyPI
+
+on:
+  workflow_dispatch
+#  push:
+#    tags: '^[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Install system dependencies
+        run: |
+          sudo apt install pandoc
+
+      - name: Install python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 pytest tox
+
+      - name: Build package
+        run: |
+          python -m tox -e clean,build
+
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
deleted file mode 100644
index bf9cd88..0000000
--- a/.github/workflows/pypi-publish.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Publish to PyPI
-
-on:
-  push:
-    tags: "*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.9
-
-      - name: Install System dependencies
-        run: |
-          sudo apt install pandoc
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install flake8 pytest tox
-
-      # - name: Lint with flake8
-      #   run: |
-      #     # stop the build if there are Python syntax errors or undefined names
-      #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-      #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-      #     # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-
-      # Skip docs build and deploy as this is handled in a separate action
-      # - name: Test with tox
-      #   run: |
-      #     tox
-      #
-      # - name: Build docs
-      #   run: |
-      #     tox -e docs
-      #
-      # - run: touch ./docs/_build/html/.nojekyll
-      #
-      # - name: GH Pages Deployment
-      #   uses: JamesIves/github-pages-deploy-action@4.1.3
-      #   with:
-      #     branch: gh-pages # The branch the action should deploy to.
-      #     folder: ./docs/_build/html
-      #     clean: true # Automatically remove deleted files from the deploy branch
-
-      - name: Build Project and Publish
-        run: |
-          python -m tox -e clean,build
-
-      - name: Publish package
-        uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/pypi-test.yml b/.github/workflows/pypi-test.yaml
similarity index 98%
rename from .github/workflows/pypi-test.yml
rename to .github/workflows/pypi-test.yaml
index 806f184..09f0c41 100644
--- a/.github/workflows/pypi-test.yml
+++ b/.github/workflows/pypi-test.yaml
@@ -3,7 +3,8 @@
 
 name: Test the library
 
-on: workflow_dispatch
+on:
+  workflow_dispatch
 #   push:
 #     branches: [main]
 #   pull_request: