diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974bf8d..bf9d2b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # PowerSync Self Hosted Example
 
+## 2025-11-25
+
+### Postgres 18 Upgrade
+
+Updated Postgres demos for Postgres 18 compatibility. Postgres 18 contains breaking changes for Docker volume mount points. First time demo runners should be able to start the demo using the standard `docker compose up` commands.
+
+Users with existing configurations should either:
+
+#### Start from a clean slate
+
+With the relevant demo directory as the current working directory, run:
+
+```bash
+# Clear previous data (this deletes Docker volumes)
+docker compose down --volumes
+
+# Run the demo
+docker compose up
+```
+
+#### Migrate existing data
+
+See https://github.com/docker-library/postgres/issues/37 for options.
+
 ## 2025-05-13
 
 - Updated YAML config files to use published schema
diff --git a/demos/nodejs-postgres-bucket-storage/docker-compose.yaml b/demos/nodejs-postgres-bucket-storage/docker-compose.yaml
index f0435ba..57c3491 100644
--- a/demos/nodejs-postgres-bucket-storage/docker-compose.yaml
+++ b/demos/nodejs-postgres-bucket-storage/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
       - ../nodejs/init-scripts:/docker-entrypoint-initdb.d
 
   pg-storage:
-    image: postgres:latest
+    image: postgres:18
     restart: always
     environment:
       - POSTGRES_USER=${PG_STORAGE_DATABASE_USER}
@@ -39,7 +39,11 @@ services:
     ports:
       - "${PG_STORAGE_DATABASE_PORT}:${PG_STORAGE_DATABASE_PORT}"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${PG_STORAGE_DATABASE_USER} -d ${PG_STORAGE_DATABASE_NAME}"]
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${PG_STORAGE_DATABASE_USER} -d ${PG_STORAGE_DATABASE_NAME}",
+        ]
       interval: 5s
       timeout: 5s
       retries: 5
diff --git a/services/postgres.yaml b/services/postgres.yaml
index 8ace49f..060d6d7 100644
--- a/services/postgres.yaml
+++ b/services/postgres.yaml
@@ -1,6 +1,6 @@
 services:
   pg-db:
-    image: postgres:latest
+    image: postgres:18
     restart: always
     environment:
       - POSTGRES_USER=${PG_DATABASE_USER}