diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4aef95ed5..92467ee04 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -60,6 +60,7 @@ body:
       label: Operating system
       description: the operating system in use
       options:
+        - Debian 12 (Bookworm) / Ubuntu 22-23 / Raspberry Pi OS 12 (including lite)
         - Debian 11 (Bullseye) / Ubuntu 20-21 / Raspbian 11 / Raspberry Pi OS 11 (including lite)
         - Debian 10 (Buster) / Ubuntu 18-19 / Raspbian 10 / Raspberry Pi OS 10 (including lite)
         - Debian 9 (Stretch) / Ubuntu 16-17 / Raspbian 9 / Raspberry Pi OS 9 (including lite)
diff --git a/.github/workflows/preparerelease.yml b/.github/workflows/preparerelease.yml
index 3a60e85b6..aa6ad024f 100644
--- a/.github/workflows/preparerelease.yml
+++ b/.github/workflows/preparerelease.yml
@@ -26,9 +26,9 @@ on:
         type: choice
         options:
           - ''
+          - bookworm
           - bullseye
           - buster
-          - stretch
 
 jobs:
   prepare-release:
diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh
index fbed022fb..a77786914 100755
--- a/contrib/docker/build.sh
+++ b/contrib/docker/build.sh
@@ -39,7 +39,7 @@ elif [[ "x$1" = "xrelease" ]]; then
 else
   namesuffix='.build'
   target=deb
-  images='bullseye buster stretch'
+  images='bookworm bullseye buster'
   if [[ -n "$LIMITIMG" ]]; then
     images=$(echo " $images " | sed -e "s#.* \($LIMITIMG\) .*#\1#")
     echo "limiting to image $images"