diff --git a/docker-compose.yml b/docker-compose.yml
index b7c26d4a..465b36cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,12 +54,14 @@ services:
     postgres:
         image: postgres:11
         environment:
-            POSTGRES_PASSWORD: password # Superuser password
-            POSTGRES_USER: root # Superuser name
+            POSTGRES_PASSWORD: password
+            POSTGRES_USER: root # superuser name
             POSTGRES_DB: main
         healthcheck:
-            test: ["CMD-SHELL", "pg_isready -U '${POSTGRES_USER}'"]
+            test: ["CMD-SHELL", "pg_isready -U postgres"]
             interval: 10s
+            timeout: 5s
+            retries: 5
     redis:
         image: redis:alpine
         healthcheck: