diff --git a/docker-compose.vhr18.yml b/docker-compose.vhr18.yml
index 128810d1fb4c7c4102bac3a7d221174d1c5575a9..c477bb70fb10c6961293ef995fa5c3da101bdea3 100644
--- a/docker-compose.vhr18.yml
+++ b/docker-compose.vhr18.yml
@@ -43,6 +43,7 @@ services:
       INSTANCE_ID: "prism-view-server_renderer"
       INSTALL_DIR: "/var/www/pvs/dev/"
       INIT_SCRIPTS: "/configure.sh /init-db.sh"
+      WAIT_SERVICES: "database:5432"
     configs:
       - source: init-db
         target: /init-db.sh
@@ -66,6 +67,7 @@ services:
     environment:
       INSTANCE_ID: "prism-view-server_cache"
       RENDERER_HOST: renderer
+      WAIT_SERVICES: "database:5432"
     deploy:
       replicas: 1
     networks:
@@ -87,6 +89,7 @@ services:
     environment:
       INSTANCE_ID: "prism-view-server_seeder"
       RENDERER_HOST: renderer
+      WAIT_SERVICES: "redis:6379 database:5432"
     deploy:
       replicas: 0
     networks:
@@ -101,6 +104,7 @@ services:
       - env/vhr18_redis.env
     environment:
       INSTANCE_ID: "prism-view-server_preprocessor"
+      WAIT_SERVICES: "redis:6379"
     deploy:
       replicas: 1
     networks:
@@ -126,6 +130,7 @@ services:
       SCALEFACTOR: "1"
       IN_MEMORY: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh"
+      WAIT_SERVICES: "redis:6379 database:5432"
     configs:
       - source: init-db
         target: /init-db.sh