diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 44de79d..11fbea4 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y wget gnupg && \
     echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
     wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 
-# Install PostgreSQL client tools for versions 11–17 and other dependencies
+# Install PostgreSQL client tools for versions 11–18 and other dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         curl \
@@ -20,9 +20,10 @@ RUN apt-get update && \
         postgresql-client-15 \
         postgresql-client-16 \
         postgresql-client-17 \
+        postgresql-client-18 \
         python3-pip && \
     mkdir -p /opt/postgresql && \
-    for version in 11 12 13 14 15 16 17; do \
+    for version in 11 12 13 14 15 16 17 18; do \
         ln -s /usr/lib/postgresql/$version/bin/pg_dump /usr/bin/pg_dump-$version && \
         ln -s /usr/lib/postgresql/$version/bin/pg_restore /usr/bin/pg_restore-$version; \
     done && \
diff --git a/postgres/bin/dump-to-s3.sh b/postgres/bin/dump-to-s3.sh
index e25618e..34ed96d 100755
--- a/postgres/bin/dump-to-s3.sh
+++ b/postgres/bin/dump-to-s3.sh
@@ -21,8 +21,8 @@ if [ -z "${SERVER_VERSION:-}" ]; then
 fi
 
 if [ -z "$SERVER_VERSION" ]; then
-  echo "Warning: SERVER_VERSION not detected. Defaulting to version 17 (latest)."
-  SERVER_VERSION="17"
+  echo "Warning: SERVER_VERSION not detected. Defaulting to version 18 (latest)."
+  SERVER_VERSION="18"
 fi
 
 PG_DUMP="pg_dump-$SERVER_VERSION"
diff --git a/postgres/bin/entrypoint.sh b/postgres/bin/entrypoint.sh
index e94afcc..9d6d214 100755
--- a/postgres/bin/entrypoint.sh
+++ b/postgres/bin/entrypoint.sh
@@ -42,8 +42,8 @@ else
   fi
 
   if [ -z "$SERVER_VERSION" ]; then
-    echo "WARNING: Unable to detect PostgreSQL version. Defaulting to latest (17)."
-    SERVER_VERSION="17"
+    echo "WARNING: Unable to detect PostgreSQL version. Defaulting to latest (18)."
+    SERVER_VERSION="18"
   else
     echo "Detected PostgreSQL version: $SERVER_VERSION"
   fi
diff --git a/postgres/bin/load-from-s3.sh b/postgres/bin/load-from-s3.sh
index b336408..063848b 100755
--- a/postgres/bin/load-from-s3.sh
+++ b/postgres/bin/load-from-s3.sh
@@ -18,8 +18,8 @@ if [ -z "${SERVER_VERSION:-}" ]; then
 fi
 
 if [ -z "$SERVER_VERSION" ]; then
-  echo "Warning: SERVER_VERSION not detected. Defaulting to version 17 (latest)."
-  SERVER_VERSION="17"
+  echo "Warning: SERVER_VERSION not detected. Defaulting to version 18 (latest)."
+  SERVER_VERSION="18"
 fi
 
 PG_RESTORE="pg_restore-$SERVER_VERSION"