diff --git a/docker-compose.yml b/docker-compose.yml
index eac221915d4aef2f33d7982e10c11b5b78cf498d..6466f56a0315fff3afe49f84ace4067519ce04ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,8 @@ services:
       test: [ "CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER} && psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -tAc \"SELECT 1 FROM pg_database WHERE datname = 'keycloak';\" | grep -q 1"]
       interval: 10s
       retries: 10
-      timeout: 10s
+      timeout: 30s
+      start_period: 500s
 
 #############################
 ## Keycloak server & setup ##