diff --git a/anonyymioodi/docker-compose.yml b/anonyymioodi/docker-compose.yml
index 49b93c805..c52c0f1ad 100644
--- a/anonyymioodi/docker-compose.yml
+++ b/anonyymioodi/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
     image: postgres:15.10
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   user-db:
@@ -28,7 +28,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
     image: postgres:15.10
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   sis-db:
@@ -41,7 +41,7 @@ services:
     image: postgres:15.10
     shm_size: 2gb
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   sis-importer-db:
@@ -53,5 +53,5 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
     image: postgres:15.10
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 6accbfd3f..9e43ee696 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -71,7 +71,7 @@ services:
     ports:
       - 4321:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   user-db:
@@ -85,7 +85,7 @@ services:
     ports:
       - 4320:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   redis:
@@ -112,7 +112,7 @@ services:
     ports:
       - 12345:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   sis-importer-db:
@@ -124,7 +124,7 @@ services:
     ports:
       - 12346:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   jami:
@@ -152,7 +152,7 @@ services:
     ports:
       - 5433:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   nginx:
diff --git a/docker-compose.yml b/docker-compose.yml
index aadbd591b..03abc52d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -94,7 +94,7 @@ services:
     volumes:
       - kone-db-data:/data
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   user-db:
@@ -108,7 +108,7 @@ services:
     volumes:
       - user-db-data:/data
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   redis:
@@ -134,7 +134,7 @@ services:
     ports:
       - 12345:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   sis-importer-db:
@@ -148,7 +148,7 @@ services:
     ports:
       - 12346:5432
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   jami:
@@ -180,7 +180,7 @@ services:
     volumes:
       - jami-data:/data
     healthcheck:
-      test: ['CMD', 'pg_isready']
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
       <<: *healthcheck-defaults
 
   sis-updater-worker: