diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b3b197..eec6551 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,9 +31,9 @@ jobs:
             toxenv: "py36-14.0"
           - python-version: "3.8"
             toxenv: "py38-15.0"
-          # - python-version: "3.8"
-          #   toxenv: "py38-master"
-          - python-version: "3.6"
+          - python-version: "3.10"
+            toxenv: "py310-16.0"
+          - python-version: "3.10"
             toxenv: "twine_check"
     services:
       postgres:
@@ -81,12 +81,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - name: Install pypa/build
-        run: python -m pip install build
       - name: Build a binary wheel and a source tarball
-        run: python -m build --sdist --wheel --outdir dist/
+        run: pipx run build
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_token }}
diff --git a/README.rst b/README.rst
index 243d2bc..040cbbe 100644
--- a/README.rst
+++ b/README.rst
@@ -114,7 +114,7 @@ as a global variable.
 Supported Odoo versions
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Odoo version 12, 13, 14 and 15 are supported.
+Odoo version 11, 12, 13, 14, 15 and 16 are supported.
 
 An important design goal is to provide a consistent behaviour
 across Odoo versions.
diff --git a/setup.py b/setup.py
index 5e16cce..751dd7f 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,8 @@
         "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",
         "Framework :: Odoo",
     ],
     entry_points="""
diff --git a/tox.ini b/tox.ini
index 032df34..8eae1bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,9 @@
 
 [tox]
 envlist =
-  py38-{15.0,master}
-  py36-{11.0,12.0,13.0,14.0,15.0}
+  py310-{16.0}
+  py38-{15.0}
+  py36-{11.0,12.0,13.0,14.0}
   twine_check
   pre_commit
 skip_missing_interpreters = True
@@ -18,6 +19,7 @@ commands =
   13.0: {toxinidir}/tests/scripts/install_odoo.py 13.0 {envdir}/src/odoo
   14.0: {toxinidir}/tests/scripts/install_odoo.py 14.0 {envdir}/src/odoo
   15.0: {toxinidir}/tests/scripts/install_odoo.py 15.0 {envdir}/src/odoo
+  16.0: {toxinidir}/tests/scripts/install_odoo.py 16.0 {envdir}/src/odoo
   master: {toxinidir}/tests/scripts/install_odoo.py master {envdir}/src/odoo
   pytest --verbose --cov=click_odoo --cov-branch --cov-report=html --cov-report=term --cov-report=xml {posargs}
 deps =