diff --git a/docker-compose-with-gpus.yml b/docker-compose-with-gpus.yml
index 6b10ae3..1b4979b 100644
--- a/docker-compose-with-gpus.yml
+++ b/docker-compose-with-gpus.yml
@@ -13,7 +13,7 @@ services:
       POSTGRES_PASSWORD: ${SOLAR_DB_PASSWORD}
       POSTGRES_DB: ${SOLAR_DB_DATABASE}
     healthcheck:
-      test: [ "CMD", "pg_isready", "-U", "postgres" ]
+      test: [ "CMD", "pg_isready", "-U", "${SOLAR_DB_USERNAME}" ]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/docker-compose.yml b/docker-compose.yml
index 99823ad..113640e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       POSTGRES_PASSWORD: ${SOLAR_DB_PASSWORD}
       POSTGRES_DB: ${SOLAR_DB_DATABASE}
     healthcheck:
-      test: [ "CMD", "pg_isready", "-U", "postgres" ]
+      test: [ "CMD", "pg_isready", "-U", "${SOLAR_DB_USERNAME}" ]
       interval: 10s
       timeout: 5s
       retries: 5