diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml
index 4ebe10d1..95857301 100644
--- a/.github/workflows/pypi-release.yml
+++ b/.github/workflows/pypi-release.yml
@@ -78,6 +78,6 @@ jobs:
 
       - name: Publish to PyPI
         if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 2a7dc0b4..8ab23688 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -5,6 +5,12 @@
 # Required
 version: 2
 
+# Build in latest ubuntu/python
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 # Build PDF & ePub
 formats:
   - epub
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 39835c69..918d62c1 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -29,8 +29,14 @@
 # ones.
 extensions = [
     "sphinx.ext.intersphinx",
+    "sphinx_reredirects",
 ]
 
+
+# Redirects for olds pages
+# See https://documatt.gitlab.io/sphinx-reredirects/usage.html
+redirects = {}
+
 # This points to aboutcode.readthedocs.io
 # In case of "undefined label" ERRORS check docs on intersphinx to troubleshoot
 # Link was created at commit - https://github.com/nexB/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
diff --git a/setup.cfg b/setup.cfg
index b02fd346..d6c7da7d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,6 +58,8 @@ testing =
     isort
 
 docs =
-    Sphinx == 5.1.0
-    sphinx-rtd-theme >= 0.5.0
-    doc8 >= 0.8.1
+    Sphinx>=5.0.2
+    sphinx-rtd-theme>=1.0.0
+    sphinx-reredirects >= 0.1.2
+    doc8>=0.11.2
+