diff --git a/module2-workflow-orchestration/airflow-2.x/compose.celery.yaml b/module2-workflow-orchestration/airflow-2.x/compose.celery.yaml
index 1646c379..45907f86 100644
--- a/module2-workflow-orchestration/airflow-2.x/compose.celery.yaml
+++ b/module2-workflow-orchestration/airflow-2.x/compose.celery.yaml
@@ -1,4 +1,4 @@
-x-postgres-image: &postgres-image postgres:${POSTGRES_VERSION:-18.1-alpine}
+x-postgres-image: &postgres-image postgres:${POSTGRES_VERSION:-18-alpine}
 x-redis-image: &redis-image redis:${REDIS_VERSION:-8.4-alpine}
 
 x-airflow-common:
@@ -52,9 +52,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
@@ -70,9 +70,9 @@ services:
     ports:
       - '5432'
     volumes:
-      - vol-airflow-metastore-celeryexec:/var/lib/postgresql/data
+      - vol-airflow-metastore-celeryexec:/var/lib/postgresql
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 3s
       retries: 5
diff --git a/module2-workflow-orchestration/airflow-2.x/compose.local.yaml b/module2-workflow-orchestration/airflow-2.x/compose.local.yaml
index fffdb2f4..07bf2302 100644
--- a/module2-workflow-orchestration/airflow-2.x/compose.local.yaml
+++ b/module2-workflow-orchestration/airflow-2.x/compose.local.yaml
@@ -1,4 +1,4 @@
-x-postgres-image: &postgres-image postgres:${POSTGRES_VERSION:-18.1-alpine}
+x-postgres-image: &postgres-image postgres:${POSTGRES_VERSION:-18-alpine}
 
 x-airflow-common:
   &airflow-common
@@ -46,9 +46,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
@@ -64,9 +64,9 @@ services:
     ports:
       - '5432'
     volumes:
-      - vol-airflow-metastore-localexec:/var/lib/postgresql/data
+      - vol-airflow-metastore-localexec:/var/lib/postgresql
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 3s
       retries: 5