diff --git a/docker/ubuntu-24.04.dockerfile b/docker/ubuntu-24.04.dockerfile
index 97008d9597d..7ef83bfba39 100644
--- a/docker/ubuntu-24.04.dockerfile
+++ b/docker/ubuntu-24.04.dockerfile
@@ -63,8 +63,8 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
-  python3.11 \
-  python3.11-venv \
+  python3.12 \
+  python3.12-venv \
   udev \
   wget \
   x11-xserver-utils \
diff --git a/docs/requirements.txt b/docs/requirements.txt
index f7104d627c8..46e47734df9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,6 +3,7 @@ furo==2024.1.29
 m2r2==0.3.3.post2
 rstcheck[sphinx]==6.2.1
 rstfmt==0.0.14
+setuptools  # required by m2r2, Ubuntu 24.04 doesn't include this
 Sphinx==7.2.6
 sphinx-copybutton==0.5.2
 sphinx_inline_tabs==2023.4.21