diff --git a/tools/docker/README.md b/tools/docker/README.md
index 2c1f648117..a896c18ad1 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -2,12 +2,11 @@
 
 **Docker containers**
 - Ubuntu
-  - focal   (Ubuntu 20.04)
-  - jammy   (Ubuntu 22.04)
-  - noble   (Ubuntu 24.04)
+  - focal     (Ubuntu 20.04)
+  - jammy     (Ubuntu 22.04)
+  - noble     (Ubuntu 24.04)
 - Debian
-  - buster  (Debian 10.0)
-  - sid     (Debian unstable)
+  - bookworm  (Debian 12)
 
 **Build docker image**
 
diff --git a/tools/docker/bookworm/Dockerfile b/tools/docker/bookworm/Dockerfile
new file mode 100644
index 0000000000..988d795778
--- /dev/null
+++ b/tools/docker/bookworm/Dockerfile
@@ -0,0 +1,35 @@
+FROM debian:bookworm
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get dist-upgrade -y \
+ && apt-get install -y locales sudo
+
+RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
+ && locale-gen en_US.UTF-8 \
+ && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
+RUN useradd docker -U -G sudo -m -s /bin/bash \
+ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list
+
+RUN apt-get update
+
+RUN apt-get install -y \
+    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
+      unzip diffutils lzop make file g++ xfonts-utils xsltproc default-jre-headless python3 \
+      libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
+      golang-1.21-go/bookworm-backports git openssh-client \
+    --no-install-recommends \
+    && ln -s /usr/lib/go-1.21 /usr/lib/go \
+    && ln -s /usr/lib/go-1.21/bin/go /usr/bin/go \
+    && ln -s /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
+
+RUN rm -rf /var/lib/apt/lists/*
+
+USER docker
diff --git a/tools/docker/buster/Dockerfile b/tools/docker/buster/Dockerfile
deleted file mode 100644
index 08941776c1..0000000000
--- a/tools/docker/buster/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM debian:buster
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get dist-upgrade -y \
- && apt-get install -y locales sudo \
- && rm -rf /var/lib/apt/lists/*
-
-RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
- && locale-gen en_US.UTF-8 \
- && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
-
-RUN adduser --disabled-password --gecos '' docker \
- && adduser docker sudo \
- && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-RUN apt-get update && apt-get install -y \
-    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip unzip diffutils lzop make file \
-    g++ xfonts-utils xsltproc default-jre-headless python3 \
-    libc6-dev libncurses5-dev \
-    libjson-perl libxml-parser-perl libparse-yapp-perl \
-    golang-go \
-    git openssh-client \
-    --no-install-recommends \
- && rm -rf /var/lib/apt/lists/*
-
-USER docker
diff --git a/tools/docker/sid/Dockerfile b/tools/docker/sid/Dockerfile
deleted file mode 100644
index 94a9482c4e..0000000000
--- a/tools/docker/sid/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM debian:sid
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get dist-upgrade -y \
- && apt-get install -y locales sudo \
- && rm -rf /var/lib/apt/lists/*
-
-RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
- && locale-gen en_US.UTF-8 \
- && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
-
-RUN adduser --disabled-password --gecos '' docker \
- && adduser docker sudo \
- && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-RUN apt-get update && apt-get install -y \
-    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip unzip diffutils lzop make file \
-    g++ xfonts-utils xsltproc default-jre-headless python3 \
-    libc6-dev libncurses5-dev \
-    libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
-    golang-go \
-    git openssh-client \
-    --no-install-recommends \
- && rm -rf /var/lib/apt/lists/*
-
-USER docker