diff --git a/.env b/.env
index 1463927..686a340 100644
--- a/.env
+++ b/.env
@@ -23,12 +23,12 @@ ORTHANC_LOG=./volumes/orthanc_logs
 #
 POSTGRES_DATA_MNT=./volumes/pg_data
 PGDATA=/var/lib/postgresql/data
+PGPASSWORD=secret
 
 POSTGRES_DB=orthanc
 POSTGRES_PORT=5432
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=password
-PGPASSWORD=secret
 
 TZ="Asia/Dhaka"
 PGTZ="Asia/Dhaka"
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c2bd11..737bc64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,16 +16,7 @@ services:
     volumes:
       - ${POSTGRES_DATA_MNT}:${PGDATA}
     healthcheck:
-      test:
-        [
-          "CMD",
-          "pg_isready",
-          "-q",
-          "-d",
-          "${POSTGRES_DB}",
-          "-U",
-          "${POSTGRES_USER}",
-        ]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       start_period: 20s
       interval: 30s
       retries: 5