diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index f3df0472..cea5d93b 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -79,9 +79,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/update.sh b/update.sh
index 8282d826..c933b2cd 100755
--- a/update.sh
+++ b/update.sh
@@ -7,7 +7,8 @@ declare -A alpine_version=(
 )
 
 declare -A debian_version=(
-	[default]='bullseye'
+	[25]='bullseye'
+	[default]='bookworm'
 )
 
 declare -A php_version=(