diff --git a/compose.postgres.yaml b/compose.postgres.yaml
index 937beac17..148932b32 100644
--- a/compose.postgres.yaml
+++ b/compose.postgres.yaml
@@ -23,7 +23,7 @@ services:
     links:
       - postgres
   postgres:
-    image: postgres
+    image: postgres:18
     environment:
       POSTGRES_USER: jellyseerr
       POSTGRES_PASSWORD: jellyseerr
@@ -31,6 +31,6 @@ services:
     ports:
       - '5432:5432'
     volumes:
-      - postgres:/var/lib/postgresql/data
+      - postgres:var/lib/postgresql/18/docker
 volumes:
   postgres:
diff --git a/docs/extending-jellyseerr/database-config.mdx b/docs/extending-jellyseerr/database-config.mdx
index df099187c..4763d7f88 100644
--- a/docs/extending-jellyseerr/database-config.mdx
+++ b/docs/extending-jellyseerr/database-config.mdx
@@ -20,7 +20,8 @@ DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging.
 ## PostgreSQL Options
 
 :::caution
-When migrating Postgres from version 17 to 18 in Docker, note that the data mount point has changed. Instead of using `/var/lib/postgresql/data`, the correct mount path is now `/var/lib/postgresql`.
+When migrating Postgres from version 17 to 18 in Docker, note that the data mount point has changed. Instead of using `/var/lib/postgresql/data`, the correct mount path is now `/var/lib/postgresql/18/docker`.
+Refer to the [PostgreSQL Docker documentation](https://hub.docker.com/_/postgres/#pgdata) to learn how to migrate or opt out of this change.
 :::
 
 ### TCP Connection