diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile
index 8d524665..44ec2eca 100644
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@@ -46,7 +46,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             OpenIPMI-devel \
             openldap-devel \
             sqlite-devel \
-            libpq-devel \
+            postgresql18-server-devel \
+            postgresql18-private-devel \
             java-21-openjdk-devel \
             git \
             gettext \
diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile
index a2a46af1..0bb095a0 100644
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@@ -68,8 +68,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             openssl \
             openssl-libs \
             pcre2 \
-            postgresql \
-            libpq \
+            postgresql18 \
+            postgresql18-private-libs \
             zlib \
             gzip \
             unixODBC" && \
diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
index 408aa4da..46fc3ad3 100644
--- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@@ -60,6 +60,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             curl \
             gzip \
             nginx \
+            postgresql18 \
             php-bcmath \
             php-curl \
             php-fpm \
@@ -69,7 +70,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             php-pgsql \
             php-json \
             php-xml \
-            postgresql \
             jq \
             findutils \
             glibc-locale-source" && \