diff --git a/tools/ci/ci_util/docs.py b/tools/ci/ci_util/docs.py
index 31a668580..49061e16e 100644
--- a/tools/ci/ci_util/docs.py
+++ b/tools/ci/ci_util/docs.py
@@ -30,7 +30,7 @@ def docs_build(
         f.writelines(['using doxygen ;\n', 'using boostbook ;\n'])
 
     # Run b2
-    run(['b2', '-j4', 'cxxstd=17', 'libs/mysql/doc//boostrelease'])
+    run(['b2', 'libs/mysql/doc//boostrelease'])
 
     # Copy the resulting docs into a well-known path
     output_dir = source_dir.joinpath('doc', 'html')
diff --git a/tools/docker/build-docs.dockerfile b/tools/docker/build-docs.dockerfile
index bdd43ccfe..debc38a8e 100644
--- a/tools/docker/build-docs.dockerfile
+++ b/tools/docker/build-docs.dockerfile
@@ -5,7 +5,7 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM openjdk:11
+FROM ubuntu:22.04
 
 COPY tools/docker/install_build_docs.sh /
 
diff --git a/tools/docker/install_build_docs.sh b/tools/docker/install_build_docs.sh
index 55e26fc9d..434cc4b68 100644
--- a/tools/docker/install_build_docs.sh
+++ b/tools/docker/install_build_docs.sh
@@ -8,6 +8,7 @@
 
 set -e
 GLOBIGNORE=".:.."
+export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies. rsync is needed by the GitHub action to upload the pages
 apt-get update
@@ -16,22 +17,13 @@ apt-get install --no-install-recommends -y \
     xsltproc \
     wget \
     ca-certificates \
-    clang-11 \
+    g++ \
     python3 \
     python-is-python3 \
-    rsync
-ln -s /usr/bin/clang++-11 /usr/bin/clang++
-ln -s /usr/bin/clang-11 /usr/bin/clang
-
-# Install saxonhe
-mkdir -p /tmp/saxonhe
-cd /tmp/saxonhe
-wget -q -O saxonhe.zip https://sourceforge.net/projects/saxon/files/Saxon-HE/9.9/SaxonHE9-9-1-4J.zip/download
-unzip -o -qq saxonhe.zip
-mkdir -p /usr/share/java/
-mv saxon9he.jar /usr/share/java/Saxon-HE.jar
-cd
-rm -rf /tmp/saxonhe
+    python3-jinja2 \
+    rsync \
+    git \
+    unzip
 
 # Install docbook XSL stylesheets
 mkdir -p $DOCBOOK_XSL_DIR