diff --git a/docker/development/compose.yml b/docker/development/compose.yml
index b694e0bf2..149a577ce 100644
--- a/docker/development/compose.yml
+++ b/docker/development/compose.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - documenso_database:/var/lib/postgresql/data
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER}']
+      test: ['CMD-SHELL', 'pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB']
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/docker/testing/compose.yml b/docker/testing/compose.yml
index 110e9da6b..7251ee523 100644
--- a/docker/testing/compose.yml
+++ b/docker/testing/compose.yml
@@ -8,7 +8,7 @@ services:
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=documenso
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U documenso']
+      test: ['CMD-SHELL', 'pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB']
       interval: 1s
       timeout: 5s
       retries: 5