diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000..736d736
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,10 @@
+version: 2
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+sphinx:
+  configuration: docs/conf.py
+python:
+  install:
+  - requirements: docs/requirements.txt
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 74f93cc..f4826ce 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,12 +17,14 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python37:
-        python.version: '3.7'
       Python38:
         python.version: '3.8'
       Python39:
         python.version: '3.9'
+      Python310:
+        python.version: '3.10'
+      Python311:
+        python.version: '3.11'
     maxParallel: 4
 
   steps:
diff --git a/docs/index.rst b/docs/index.rst
index 5f130ba..da62866 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,7 +65,7 @@ versions.
 
 Flask-PyMongo is tested against `supported versions
 <https://www.mongodb.com/support-policy>`_ of MongoDB, and Python
-and 3.6+. For the exact list of version combinations that are tested and
+and 3.8+. For the exact list of version combinations that are tested and
 known to be compatible, see the `envlist` in `tox.ini
 <https://github.com/dcrosta/flask-pymongo/blob/master/tox.ini>`_.
 
diff --git a/setup.py b/setup.py
index 428f63f..539c7d9 100644
--- a/setup.py
+++ b/setup.py
@@ -30,8 +30,8 @@
     platforms="any",
     packages=find_packages(),
     install_requires=[
-        "Flask>=0.12",
-        "PyMongo>=3.3",
+        "Flask>=1.0",
+        "PyMongo>=3.11",
         "six",
     ],
     classifiers=[
diff --git a/tox.ini b/tox.ini
index 9c47c45..8aab5d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,31 @@
 [tox]
 
-; keep the pymongo list in sync with what's in .travis.yaml
+; pymongo{311,312,40,41,42,43}-mongo{4x,5x,6x}-flask{10,11,2x}, style
 envlist=
-    pymongo{37,38,39,310,311,312}-mongo{40,42,44,50}-flask{10,11,20}, style
+    pymongo{311,312}-mongo{4x,5x,6x}-flask{10,11,2x}, style
 
 [testenv]
 docker =
-    mongo40: mongo40
-    mongo42: mongo42
-    mongo44: mongo44
-    mongo50: mongo50
+    mongo4x: mongo4x
+    mongo5x: mongo5x
+    mongo6x: mongo6x
 
 deps =
     pytest
+    markupsafe<2.1
 
-    pymongo37: pymongo>=3.7,<3.8
-    pymongo38: pymongo>=3.8,<3.9
-    pymongo39: pymongo>=3.9,<3.10
-    pymongo310: pymongo>=3.10,<3.11
     pymongo311: pymongo>=3.11,<3.12
     pymongo312: pymongo>=3.12,<3.13
+    pymongo40: pymongo>=4.0,<4.1
+    pymongo41: pymongo>=4.1,<4.2
+    pymongo42: pymongo>=4.2,<4.3
+    pymongo43: pymongo>=4.3,<4.4
 
     flask10:   flask>=1.0,<1.1
+    flask10:   jinja2<3.0
+    flask10:   itsdangerous<2.1.0
     flask11:   flask>=1.1,<1.2
-    flask20:   flask>=2.0,<2.1
+    flask2x:   flask>=2.0,<3.0
 
 commands =
     {envbindir}/py.test --tb=native {toxinidir}
@@ -32,7 +34,7 @@ commands =
 skipsdist = true
 skip_install = true
 deps =
-    flake8
+    flake8<6
     flake8-quotes
     flake8-commas
     https://github.com/dcrosta/flake8-import-order/archive/add-fromsfirst-style.tar.gz#egg=flake8-import-order
@@ -50,14 +52,11 @@ ignore = D100,D104,D107
 exclude =
     _version.py
 
-[docker:mongo40]
-image = mongo:4.0
+[docker:mongo4x]
+image = mongo:4
 
-[docker:mongo42]
-image = mongo:4.2
+[docker:mongo5x]
+image = mongo:5
 
-[docker:mongo44]
-image = mongo:4.4
-
-[docker:mongo50]
-image = mongo:5.0
+[docker:mongo6x]
+image = mongo:6