diff --git a/.env.example b/.env.example
index e799c489d..16c4777f8 100644
--- a/.env.example
+++ b/.env.example
@@ -27,4 +27,4 @@
 
 # Ports to which MariaDB and PostgreSQL should bind.
 # MARIADB_PORT=4001
-# POSTGRES_PORT=5432
+# POSTGRES_PORT=4002
diff --git a/compose.intel.yaml b/compose.intel.yaml
index 73164d3f8..74dc332ea 100644
--- a/compose.intel.yaml
+++ b/compose.intel.yaml
@@ -93,8 +93,9 @@ services:
       PHOTOPRISM_HTTP_MODE: "debug"
       PHOTOPRISM_HTTP_HOST: "0.0.0.0"
       PHOTOPRISM_HTTP_PORT: 2342
-      PHOTOPRISM_HTTP_COMPRESSION: "zstd,gzip"             # improves transfer speed and bandwidth utilization (none, gzip, zstd, or comma-separated list e.g. "zstd,gzip")
-      MYSQL_TCP_PORT: "${MARIADB_PORT:-4001}"              # default port used by the "mariadb" client (see .my.cnf)
+      PHOTOPRISM_HTTP_COMPRESSION: "zstd,gzip"       # improves transfer speed and bandwidth utilization (none, gzip, zstd, or comma-separated list e.g. "zstd,gzip")
+      MYSQL_TCP_PORT: "${MARIADB_PORT:-4001}"        # default MariaDB database port used by the "mariadb" client (see .my.cnf)
+      PGPORT: "${POSTGRES_PORT:-4002}"               # default PostgreSQL database port used by "qsql"
       PHOTOPRISM_DATABASE_DRIVER: "mysql"
       PHOTOPRISM_DATABASE_SERVER: "mariadb:${MARIADB_PORT:-4001}"
       PHOTOPRISM_DATABASE_NAME: "photoprism"
diff --git a/compose.nvidia.yaml b/compose.nvidia.yaml
index 6d10860d4..e76103b16 100644
--- a/compose.nvidia.yaml
+++ b/compose.nvidia.yaml
@@ -96,8 +96,9 @@ services:
       PHOTOPRISM_HTTP_MODE: "debug"
       PHOTOPRISM_HTTP_HOST: "0.0.0.0"
       PHOTOPRISM_HTTP_PORT: 2342
-      PHOTOPRISM_HTTP_COMPRESSION: "zstd,gzip"             # improves transfer speed and bandwidth utilization (none, gzip, zstd, or comma-separated list e.g. "zstd,gzip")
-      MYSQL_TCP_PORT: "${MARIADB_PORT:-4001}"              # default port used by the "mariadb" client (see .my.cnf)
+      PHOTOPRISM_HTTP_COMPRESSION: "zstd,gzip"       # improves transfer speed and bandwidth utilization (none, gzip, zstd, or comma-separated list e.g. "zstd,gzip")
+      MYSQL_TCP_PORT: "${MARIADB_PORT:-4001}"        # default MariaDB database port used by the "mariadb" client (see .my.cnf)
+      PGPORT: "${POSTGRES_PORT:-4002}"               # default PostgreSQL database port used by "qsql"
       PHOTOPRISM_DATABASE_DRIVER: "mysql"
       PHOTOPRISM_DATABASE_SERVER: "mariadb:${MARIADB_PORT:-4001}"
       PHOTOPRISM_DATABASE_NAME: "photoprism"
diff --git a/compose.yaml b/compose.yaml
index 87d6748fd..1362cf2da 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -101,7 +101,8 @@ services:
       PHOTOPRISM_HTTP_HOST: "0.0.0.0"
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_HTTP_COMPRESSION: "zstd,gzip"       # improves transfer speed and bandwidth utilization (none, gzip, zstd, or comma-separated list e.g. "zstd,gzip")
-      MYSQL_TCP_PORT: "${MARIADB_PORT:-4001}"        # default port used by the "mariadb" client (see .my.cnf)
+      MYSQL_TCP_PORT: "${MARIADB_PORT:-4001}"        # default MariaDB database port used by the "mariadb" client (see .my.cnf)
+      PGPORT: "${POSTGRES_PORT:-4002}"               # default PostgreSQL database port used by "qsql"
       PHOTOPRISM_DATABASE_DRIVER: "mysql"
       PHOTOPRISM_DATABASE_SERVER: "mariadb:${MARIADB_PORT:-4001}"
       PHOTOPRISM_DATABASE_NAME: "photoprism"
@@ -219,10 +220,10 @@ services:
   postgres:
     image: postgres:18-alpine
     expose:
-      - "${POSTGRES_PORT:-5432}"
+      - "${POSTGRES_PORT:-4002}"
     ## Publish the PostgreSQL port on the host for direct access from the host:
     ports:
-      - "${SERVICES_BIND_HOST:-127.0.0.1}:${POSTGRES_PORT:-5432}:${POSTGRES_PORT:-5432}" # PostgreSQL
+      - "${SERVICES_BIND_HOST:-127.0.0.1}:${POSTGRES_PORT:-4002}:${POSTGRES_PORT:-4002}" # PostgreSQL
     volumes:
       - "postgres:/var/lib/postgresql"
       - "./scripts/sql/postgresql-init.sql:/docker-entrypoint-initdb.d/init.sql"
@@ -230,7 +231,7 @@ services:
       POSTGRES_DB: photoprism
       POSTGRES_USER: photoprism
       POSTGRES_PASSWORD: photoprism
-      PGPORT: "${POSTGRES_PORT:-5432}"
+      PGPORT: "${POSTGRES_PORT:-4002}"
       PGDATA: /var/lib/postgresql/18/docker
 
   ## Qdrant (Vector Database)