diff --git a/be/docker/production/docker-compose.production.yml b/be/docker/production/docker-compose.production.yml
index 08063a2..eff6107 100644
--- a/be/docker/production/docker-compose.production.yml
+++ b/be/docker/production/docker-compose.production.yml
@@ -66,12 +66,16 @@ services:
       - POSTGRES_PASSWORD=${DB_PASSWORD}
       - POSTGRES_DB=${DB_DATABASE}
     volumes:
-      - db-data-production:/var/lib/postgres
+      - db-data-production:/var/lib/postgresql/data
       - ./be/docker/postgres/conf.d:/etc/postgres/conf.d:ro
     networks:
       - mykopkb-production-network
     healthcheck:
-      test: ["CMD-SHELL", 'pg_isready -U "$$POSTGRES_USER" || exit 1']
+      test:
+        [
+          "CMD-SHELL",
+          'pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB" || exit 1',
+        ]
       interval: 15s
       timeout: 10s
       retries: 5