diff --git a/18.0.Dockerfile b/18.0.Dockerfile
index 4dd218c48cb6459d5c971e47de0ed845b188395d..a1efab051aaef24cd0b16d38b3d70c8595e8d070 100644
--- a/18.0.Dockerfile
+++ b/18.0.Dockerfile
@@ -35,11 +35,14 @@ RUN set -x; \
     git \
     gnupg \
     openssh-client \
-    postgresql-client \
     xmlsec1 \
+  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
+  && curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
   && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \
   && echo 'e9f95436298c77cc9406bd4bbd242f4771d0a4b2 wkhtmltox.deb' | sha1sum -c - \
+  && apt-get update \
   && apt-get install --yes --no-install-recommends ./wkhtmltox.deb \
+  && apt-get install --yes --no-install-recommends postgresql-client \
   && apt-get -y autoremove \
   && rm -rf /var/lib/apt/lists/* wkhtmltox.deb