diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4851e83..342b28c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,6 +26,10 @@ jobs:
           - almalinux9-ppc64le
           - almalinux9-x86_64
           - bionic-ppc64el
+          - bookworm-amd64
+          - bookworm-arm64
+          - bookworm-i386
+          - bookworm-ppc64el
           - buster-ppc64el
           - bullseye-amd64
           - bullseye-arm64
@@ -37,6 +41,7 @@ jobs:
           - jammy-amd64
           - jammy-arm64
           - jammy-ppc64el
+          - raspberrypi.bookworm-armhf
           - raspberrypi.bullseye-armhf
       fail-fast: false
     steps:
diff --git a/build.yml b/build.yml
index 0038a7f..f82aeb4 100644
--- a/build.yml
+++ b/build.yml
@@ -60,6 +60,55 @@ docker-targets:
       xfonts-base
       zlib1g
 
+  bookworm:
+    source: docker/Dockerfile.debian
+    args:
+      from: debian:bookworm
+      python: python3
+    output: deb
+    matrix: ['amd64', 'i386', 'arm64', 'armhf', 'armel', 'ppc64el']
+    depend: >
+      ca-certificates
+      fontconfig
+      libc6
+      libfreetype6
+      libjpeg62-turbo
+      libpng16-16
+      libssl3
+      libstdc++6
+      libx11-6
+      libxcb1
+      libxext6
+      libxrender1
+      xfonts-75dpi
+      xfonts-base
+      zlib1g
+
+  raspberrypi.bookworm-armhf:
+    source: docker/Dockerfile.debian
+    args:
+      from: balenalib/rpi-raspbian:bookworm
+      python: python3
+    output: deb
+    qemu:   linux/386 # see https://github.com/RPi-Distro/pi-gen/issues/271
+    arch:   armhf
+    depend: >
+      ca-certificates
+      fontconfig
+      libc6
+      libfreetype6
+      libjpeg62-turbo
+      libpng16-16
+      libssl3
+      libstdc++6
+      libx11-6
+      libxcb1
+      libxext6
+      libxrender1
+      xfonts-75dpi
+      xfonts-base
+      zlib1g
+
   raspberrypi.bullseye-armhf:
     source: docker/Dockerfile.debian
     args: