diff --git a/.github/workflows/publish.yml b/.github/workflows/docker-hub.yml
similarity index 93%
rename from .github/workflows/publish.yml
rename to .github/workflows/docker-hub.yml
index 0ed948c..8fa86ac 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/docker-hub.yml
@@ -1,10 +1,9 @@
-name: Publish Docker image
+name: Publish
 
 on:
   push:
     branches:
       - 'master'
-      - 'devel'
     tags:
       - 'v*'
 
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
new file mode 100644
index 0000000..ee77ec4
--- /dev/null
+++ b/.github/workflows/pypi.yml
@@ -0,0 +1,15 @@
+name: PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  pypi:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: pip install -U poetry twine wheel
+      - run: poetry build
+      - run: twine upload --non-interactive -u __token__ -p ${{ secrets.PYPI_TOKEN }} dist/*
diff --git a/README.md b/README.md
index 29a19cc..a0fe1fe 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 [![Tests](https://github.com/nim65s/matrix-webhook/actions/workflows/test.yml/badge.svg)](https://github.com/nim65s/matrix-webhook/actions/workflows/test.yml)
 [![Lints](https://github.com/nim65s/matrix-webhook/actions/workflows/lint.yml/badge.svg)](https://github.com/nim65s/matrix-webhook/actions/workflows/lint.yml)
-[![Publish](https://github.com/nim65s/matrix-webhook/actions/workflows/publish.yml/badge.svg)](https://github.com/nim65s/matrix-webhook/actions/workflows/publish.yml)
+[![Docker-Hub](https://github.com/nim65s/matrix-webhook/actions/workflows/docker-hub.yml/badge.svg)](https://hub.docker.com/r/nim65s/matrix-webhook)
+[![PyPI](https://github.com/nim65s/matrix-webhook/actions/workflows/pypi.yml/badge.svg)](https://pypi.org/project/matrix-webhook/)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![codecov](https://codecov.io/gh/nim65s/matrix-webhook/branch/master/graph/badge.svg?token=BLGISGCYKG)](https://codecov.io/gh/nim65s/matrix-webhook)
 
diff --git a/pyproject.toml b/pyproject.toml
index 1256ae8..b85b4ca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ homepage = "https://github.com/nim65s/matrix-webhook"
 repository = "https://github.com/nim65s/matrix-webhook.git"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.8"
 Markdown = "^3.3.4"
 matrix-nio = "^0.18.3"