diff --git a/module4-analytics-engineering/postgres/compose.yaml b/module4-analytics-engineering/postgres/compose.yaml
index 9fe5cd8b..be668a6b 100644
--- a/module4-analytics-engineering/postgres/compose.yaml
+++ b/module4-analytics-engineering/postgres/compose.yaml
@@ -1,4 +1,4 @@
-x-postgres-image: &postgres-image postgres:${POSTGRES_VERSION:-17-alpine}
+x-postgres-image: &postgres-image postgres:${POSTGRES_VERSION:-18-alpine}
 
 services:
   ingest-db:
@@ -11,9 +11,9 @@ services:
     ports:
       - '5432:5432'
     volumes:
-      - vol-ingest-db:/var/lib/postgresql/data
+      - vol-ingest-db:/var/lib/postgresql
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5