diff --git a/.github/docs-image/Dockerfile b/.github/docs-image/Dockerfile
new file mode 100644
index 00000000..beb782e0
--- /dev/null
+++ b/.github/docs-image/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# install apt deps
+COPY packages.txt .
+RUN apt-get update && \
+    xargs -a packages.txt apt-get install -y && \
+    rm -rf /var/lib/apt/lists/*
+
+# install pip deps
+COPY pip.txt .
+RUN pip3 install --break-system-packages -r pip.txt
diff --git a/.github/docs-image/packages.txt b/.github/docs-image/packages.txt
new file mode 100644
index 00000000..7eb937a7
--- /dev/null
+++ b/.github/docs-image/packages.txt
@@ -0,0 +1,5 @@
+make
+pandoc
+python3-pip
+texinfo
+texlive-plain-generic
diff --git a/.github/docs-image/pip.txt b/.github/docs-image/pip.txt
new file mode 100644
index 00000000..cfc55806
--- /dev/null
+++ b/.github/docs-image/pip.txt
@@ -0,0 +1 @@
+md-toc
diff --git a/.github/workflows/build-docs-image.yml b/.github/workflows/build-docs-image.yml
new file mode 100644
index 00000000..ef2318bd
--- /dev/null
+++ b/.github/workflows/build-docs-image.yml
@@ -0,0 +1,35 @@
+name: Build Docs Image
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - ".github/docs-image/**"
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/build-push-action@v5
+        with:
+          context: .github/docs-image
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}/docs-builder:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 5ea5a3b1..ff30eb71 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -12,23 +12,12 @@ on:
 jobs:
   build-docs:
     runs-on: ubuntu-latest
+
     container:
-      image: ubuntu:24.04
+      image: ghcr.io/${{ github.repository }}/docs-builder:latest
 
     steps:
       - uses: actions/checkout@v5
 
-      - name: Install dependencies
-        run: |
-          apt-get update
-          apt-get install -y \
-            make \
-            pandoc \
-            python3-pip \
-            texinfo \
-            texlive-plain-generic
-          pip3 install md-toc --break-system-packages
-
       - name: Build docs
-        run: |
-          make doc-regenerate
+        run: make doc-regenerate
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 666392c8..39e75eda 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -10,6 +10,7 @@
 @c Last-Mod:     29-Mar-26 at 23:39:42 by Bob Weiner
 
 @c %**start of header (This is for running Texinfo on a region.)
+
 @setfilename hyperbole.info
 @ifnothtml
 @settitle GNU Hyperbole Manual
@@ -30,8 +31,8 @@
 @set txicodequoteundirected
 @set txicodequotebacktick
 
-@set UPDATED March 29, 2026
-@set UPDATED-MONTH March 2026
+@set UPDATED April 8, 2026
+@set UPDATED-MONTH April 2026
 @set EDITION 9.0.2pre
 @set VERSION 9.0.2pre
 
@@ -171,7 +172,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
 
 <PRE>
 Edition 9.0.2pre
-Printed March 29, 2026.
+Printed April 8, 2026.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -213,7 +214,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 @example
 Edition 9.0.2pre
-March 29, 2026 @c AUTO-REPLACE-ON-SAVE
+April 8, 2026 @c AUTO-REPLACE-ON-SAVE
 
 
   Published by the Free Software Foundation, Inc.