diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..4580f06
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,36 @@
+---
+name: PyPI Release
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: ["3.10"] # Use only one version for sdist
+
+    steps:
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: |
+          python setup.py sdist
+          pip install twine
+          twine upload dist/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c17cd42..765269f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.6", "3.7", "3.8", "3.9"]
+        python: ["3.8", "3.9", "3.10"]
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies
diff --git a/pytest_jira.py b/pytest_jira.py
index 9f3b1ed..babb52c 100644
--- a/pytest_jira.py
+++ b/pytest_jira.py
@@ -478,7 +478,8 @@ def pytest_addoption(parser):
     group.addoption('--jira-return-metadata',
                     action='store_true',
                     dest='return_jira_metadata',
-                    default=_get_value(config, 'DEFAULT', 'return_jira_metadata'),
+                    default=_get_value(
+                        config, 'DEFAULT', 'return_jira_metadata'),
                     help='If set, will return Jira issue with ticket metadata'
                     )
 
diff --git a/setup.cfg b/setup.cfg
index f636932..7f86a7d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,9 +3,9 @@ name=pytest-jira
 author=James Laska
 author_email=james.laska@gmail.com
 summary=py.test JIRA integration plugin, using markers
-description-file=README.rst
+description_file=README.rst
 license=GPLv2
-home-page=http://github.com/rhevm-qe-automation/pytest_jira
+home_page=http://github.com/rhevm-qe-automation/pytest_jira
 keywords=
     pytest
     jira
@@ -19,9 +19,9 @@ classifier=
     Operating System :: POSIX
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Software Development :: Testing
     Topic :: Software Development :: Quality Assurance
     Topic :: Utilities
diff --git a/tox.ini b/tox.ini
index e96c004..e54ab97 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,pep8
+envlist = py38,py39,py310,pep8
 
 [testenv]
 deps=