diff --git a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
similarity index 94%
rename from automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
rename to automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
index 11860425a6..b3295c435e 100644
--- a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
+++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="xen-devel@lists.xenproject.org"
 
diff --git a/automation/build/debian/unstable-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile
similarity index 97%
rename from automation/build/debian/unstable-arm64v8.dockerfile
rename to automation/build/debian/bookworm-arm64v8.dockerfile
index b9b1587f88..a6d4246d96 100644
--- a/automation/build/debian/unstable-arm64v8.dockerfile
+++ b/automation/build/debian/bookworm-arm64v8.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="xen-devel@lists.xenproject.org"
 
diff --git a/automation/build/debian/unstable-cppcheck.dockerfile b/automation/build/debian/bookworm-cppcheck.dockerfile
similarity index 95%
rename from automation/build/debian/unstable-cppcheck.dockerfile
rename to automation/build/debian/bookworm-cppcheck.dockerfile
index adc192cea6..d64fb7b18c 100644
--- a/automation/build/debian/unstable-cppcheck.dockerfile
+++ b/automation/build/debian/bookworm-cppcheck.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable AS builder
+FROM arm64v8/debian:bookworm AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CPPCHECK_VERSION=2.7
@@ -24,7 +24,7 @@ RUN curl -fsSLO https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".t
         FILESDIR=/usr/share/cppcheck \
         HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
 
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck
 COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck
 
diff --git a/automation/build/debian/unstable-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile
similarity index 97%
rename from automation/build/debian/unstable-i386.dockerfile
rename to automation/build/debian/bookworm-i386.dockerfile
index 1c4928b09e..eb1c732f53 100644
--- a/automation/build/debian/unstable-i386.dockerfile
+++ b/automation/build/debian/bookworm-i386.dockerfile
@@ -1,4 +1,4 @@
-FROM i386/debian:unstable
+FROM i386/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="xen-devel@lists.xenproject.org"
 
diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/bookworm.dockerfile
similarity index 98%
rename from automation/build/debian/unstable.dockerfile
rename to automation/build/debian/bookworm.dockerfile
index 6ef2878200..f8415425e6 100644
--- a/automation/build/debian/unstable.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:unstable
+FROM debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="xen-devel@lists.xenproject.org"
 
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 16d480ab75..acdef1b548 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -37,11 +37,11 @@ case "_${CONTAINER}" in
     _stretch|_) CONTAINER="${BASE}/debian:stretch" ;;
     _stretch-i386) CONTAINER="${BASE}/debian:stretch-i386" ;;
     _buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;;
-    _unstable|_) CONTAINER="${BASE}/debian:unstable" ;;
-    _unstable-i386) CONTAINER="${BASE}/debian:unstable-i386" ;;
-    _unstable-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:unstable-arm64v8-arm32-gcc" ;;
-    _unstable-arm64v8) CONTAINER="${BASE}/debian:unstable-arm64v8" ;;
-    _unstable-cppcheck) CONTAINER="${BASE}/debian:unstable-cppcheck" ;;
+    _bookworm|_) CONTAINER="${BASE}/debian:bookworm" ;;
+    _bookworm-i386) CONTAINER="${BASE}/debian:bookworm-i386" ;;
+    _bookworm-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:bookworm-arm64v8-arm32-gcc" ;;
+    _bookworm-arm64v8) CONTAINER="${BASE}/debian:bookworm-arm64v8" ;;
+    _bookworm-cppcheck) CONTAINER="${BASE}/debian:bookworm-cppcheck" ;;
     _bionic) CONTAINER="${BASE}/ubuntu:bionic" ;;
     _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;;
     _xenial) CONTAINER="${BASE}/ubuntu:xenial" ;;