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 ae825c7..8fcf700 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_linux.yml b/.github/workflows/python_ci_linux.yml
index 97483fe..d8051f4 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -155,7 +155,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/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
index 8edf929..5c5c896 100644
--- a/.github/workflows/python_ci_macos.yml
+++ b/.github/workflows/python_ci_macos.yml
@@ -28,7 +28,7 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.7", os-ver: "13", testenvs: "py37,build", experimental: False}
+          - {python-version: "3.7", os-ver: "15-intel", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7597e0d..c360a5a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -43,7 +43,7 @@ repos:
     - id: bind-requirements
 
  - repo: https://github.com/python-formate/flake8-dunder-all
-   rev: v0.4.1
+   rev: v0.5.0
    hooks:
     - id: ensure-dunder-all
       files: ^notebook2script/.*\.py$
@@ -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 b9156f1..29ec6c0 100644
--- a/doc-source/requirements.txt
+++ b/doc-source/requirements.txt
@@ -1,8 +1,10 @@
 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
+roman>=4.0
 seed-intersphinx-mapping>=1.2.2
 sphinx>=3.0.3
 sphinx-copybutton>=0.5.2
diff --git a/tox.ini b/tox.ini
index 7065a85..cd2db41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,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}
@@ -98,6 +98,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