diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml
index 331606e..81c4025 100644
--- a/.github/workflows/docs_test_action.yml
+++ b/.github/workflows/docs_test_action.yml
@@ -29,7 +29,7 @@ jobs:
               - '!tests/**'
 
       - name: Install and Build 🔧
-        uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1
+        uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1-py39
         if: steps.changes.outputs.code == 'true'
         with:
           pre-build-command: python -m pip install tox
diff --git a/.github/workflows/octocheese.yml b/.github/workflows/octocheese.yml
index ad8b40c..afa2c65 100644
--- a/.github/workflows/octocheese.yml
+++ b/.github/workflows/octocheese.yml
@@ -6,6 +6,9 @@ on:
   schedule:
     - cron: 0 12 * * *
 
+permissions:
+  contents: write
+
 jobs:
   Run:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
index 65b29d9..c740aeb 100644
--- a/.github/workflows/python_ci.yml
+++ b/.github/workflows/python_ci.yml
@@ -36,8 +36,8 @@ jobs:
           - {python-version: "3.12", testenvs: "py312-flake8{5,6,7},build", experimental: False}
           - {python-version: "3.13", testenvs: "py313-flake8{5,6,7},build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37-flake8{4,5},build", experimental: False}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-flake8{4,5,6,7},build", experimental: False}
-          - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-flake8{4,5,6,7},build", experimental: True}
+          - {python-version: "pypy-3.8", testenvs: "pypy38-flake8{4,5,6,7}", experimental: False}
+          - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-flake8{4,5,6,7}", experimental: True}
 
     steps:
       - name: Checkout 🛎️
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
index 4280be4..18f853b 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -161,7 +161,7 @@ jobs:
 
       - name: Upload distribution to PyPI 🚀
         if: startsWith(github.ref, 'refs/tags/')
-        uses: pypa/gh-action-pypi-publish@v1.4.2
+        uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 96f0672..b52f62e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,11 +62,11 @@ repos:
     - id: rst-inline-touching-normal
 
  - repo: https://github.com/asottile/pyupgrade
-   rev: v2.12.0
+   rev: v3.3.0
    hooks:
     - id: pyupgrade
       args:
-       - --py36-plus
+       - --py37-plus
        - --keep-runtime-typing
 
  - repo: https://github.com/Lucas-C/pre-commit-hooks
diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
index ccc1c24..36b958f 100644
--- a/doc-source/requirements.txt
+++ b/doc-source/requirements.txt
@@ -1,10 +1,12 @@
 git+https://github.com/domdfcoding/sphinx-click.git
 default-values>=0.6.0
+docutils<0.22
 extras-require>=0.5.0
 furo==2021.06.18b36
 html-section>=0.3.0
 pyyaml>=5.3.1
 repo-helper-sphinx-theme>=0.0.2
+roman>=4.0
 seed-intersphinx-mapping>=1.2.2
 sphinx>=3.3.0
 sphinx-copybutton>=0.2.12
diff --git a/tox.ini b/tox.ini
index 1a9d71f..0937d84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -93,7 +93,7 @@ setenv =
 [testenv:docs]
 setenv = SHOW_TODOS = 1
 passenv = SPHINX_BUILDER
-basepython = python3.8
+basepython = python3.9
 changedir = {toxinidir}/doc-source
 deps = -r{toxinidir}/doc-source/requirements.txt
 commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs}
@@ -137,6 +137,7 @@ deps =
     flake8-sphinx-links>=0.0.4
     flake8-strftime>=0.1.1
     flake8-typing-imports>=1.10.0
+    git+https://github.com/domdfcoding/restructuredtext-lint.git@fix-deprecations
     git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git
     git+https://github.com/domdfcoding/flake8-rst-docstrings.git
     git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods