diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
deleted file mode 100644
index 71374ba..0000000
--- a/.github/workflows/python-publish.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: pypi publish
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Python
-      uses: actions/setup-python@master
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4918cf1..5f37a48 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ on:
     tags:
       - 'v*'
 
-name: Create Release
+name: Release and publish
 
 jobs:
   build:
@@ -12,6 +12,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -21,7 +22,27 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           body: |
-            Please check the [HISTORY.rst](HISTORY.rst) file for a detailed list
+            Please check [HISTORY.rst](HISTORY.rst) file for a detailed list
             of changes.
           draft: false
           prerelease: true
+
+      - name: Set up Python
+        uses: actions/setup-python@master
+        with:
+            python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+            python -m pip install --upgrade pip
+            pip install setuptools wheel
+
+      - name: Build dist and wheel
+        run: |
+            python setup.py sdist bdist_wheel
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+            user: __token__
+            password: ${{ secrets.PYPI_PASSWORD }}