diff --git a/setup.py b/setup.py
index 65a160fe5a58c61d2575d90ed1bf18decf7678f9..daaeb268ec36cf829d3ff75ee7cb61ff1d36eb39 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ def read(fname):
 
 setup(
     name="pirates",
-    version="0.5.0",
+    version="0.6.0",
     license="MIT",
     description="Django app for users, teamds and groups.",
     long_description=read("README.md"),
@@ -31,15 +31,14 @@ setup(
         "Operating System :: OS Independent",
         "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",
         "Programming Language :: Python :: Implementation :: CPython",
         "Framework :: Django",
-        "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.0",
         "Framework :: Django :: 3.1",
+        "Framework :: Django :: 4.0",
         "Topic :: Utilities",
     ],
     project_urls={
@@ -48,6 +47,6 @@ setup(
         "Issue Tracker": "https://gitlab.pirati.cz/to/pirates/issues",
     },
     keywords=["django", "openid", "sso"],
-    python_requires=">=3.6",
-    install_requires=["mozilla-django-oidc>=1.2.4,<2"],
+    python_requires=">=3.8",
+    install_requires=["mozilla-django-oidc>=2,<2.1"],
 )
diff --git a/tox.ini b/tox.ini
index a7bafd63549972248ccb9c94bd0f9da068440203..1295e62c336109928953d4f42fc9eb56b7157487 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 envlist =
-    py{36,37,38,39}-django{31,30,22}
+    py{38,39,310}-django{40,31,30}
 
 [testenv]
 deps =
     -r{toxinidir}/tests/requirements.txt
+    django40: Django>=4.0,<4.1
     django31: Django>=3.1,<3.2
     django30: Django>=3.0,<3.1
-    django22: Django>=2.2,<3
 setenv =
     PYTHONPATH = {toxinidir}
     PYTHONUNBUFFERED = yes