diff --git a/docker-compose.yml b/docker-compose.yml
index 039f82a14..3468b0380 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     volumes:
       - 4cat_db:/var/lib/postgresql/data/
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER}" ]
       interval: 5s
       timeout: 5s
       retries: 5
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index dcb3896c9..48a53747e 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -12,7 +12,7 @@ services:
     volumes:
       - 4cat_db:/var/lib/postgresql/data/
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER}" ]
       interval: 5s
       timeout: 5s
       retries: 5
diff --git a/docker-compose_public_ip.yml b/docker-compose_public_ip.yml
index 174473ed9..244e77e18 100644
--- a/docker-compose_public_ip.yml
+++ b/docker-compose_public_ip.yml
@@ -21,7 +21,7 @@ services:
     volumes:
       - 4cat_db:/var/lib/postgresql/data/
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER}" ]
       interval: 5s
       timeout: 5s
       retries: 5