diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index 9250e45..c8ea359 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -23,7 +23,7 @@ RUN git checkout $APK_TOOLS_COMMIT
 RUN make -j$(nproc) static
 
 
-FROM        debian:11
+FROM        debian:13
 LABEL       maintainer="OpenWrt Maintainers"
 
 ARG         DEBIAN_FRONTEND=noninteractive
@@ -41,8 +41,9 @@ RUN \
 		build-essential \
 		gawk \
 		git-core \
+		gnupg \
 		gosu \
-		libncurses5-dev \
+		libncurses-dev \
 		locales \
 		pv \
 		pwgen \
@@ -65,7 +66,8 @@ RUN \
 		"buildbot-grid-view==$BUILDBOT_VERSION" \
 		"buildbot-worker==$BUILDBOT_VERSION" \
 		pyOpenSSL \
-		service_identity
+		service_identity \
+		legacy-cgi
 
 RUN \
 	sed -i \
diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile
index 9263127..f980e53 100644
--- a/docker/buildworker/Dockerfile
+++ b/docker/buildworker/Dockerfile
@@ -1,4 +1,4 @@
-FROM        debian:11
+FROM        debian:13
 LABEL       maintainer="OpenWrt Maintainers"
 
 ARG         DEBIAN_FRONTEND=noninteractive
@@ -24,10 +24,11 @@ RUN \
 		gcc-multilib \
 		genisoimage \
 		git-core \
+		gnupg \
 		gosu \
 		libdw-dev \
 		libelf-dev \
-		libncurses5-dev \
+		libncurses-dev \
 		locales \
 		pv \
 		pwgen \
@@ -39,6 +40,7 @@ RUN \
 		qemu-utils \
 		rsync \
 		signify-openbsd \
+		shfmt \
 		subversion \
 		swig \
 		unzip \
@@ -54,7 +56,9 @@ RUN pip3 install \
 		"buildbot-worker==$BUILDBOT_VERSION" \
 		pyelftools \
 		pyOpenSSL \
-		service_identity
+		service_identity \
+		legacy-cgi
+
 
 ENV LANG=en_US.utf8