diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index a72c5b1..b834774 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -33,7 +33,8 @@ services:
     networks:
       - strapi-rpb
     depends_on:
-      - strapi-rpbDB
+      strapi-rpbDB:
+        condition: service_healthy
 
   strapi-rpbDB:
     container_name: strapi-rpbDB
@@ -62,6 +63,11 @@ services:
       - 5434:5432
     networks:
       - strapi-rpb
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U strapi"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
 
   adminer:
     image: adminer
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index 3de9ef0..ff2ee92 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -22,6 +22,7 @@ services:
       - ./config:/opt/app/config
       - ./config.json:/opt/app/config.json
       - ./src:/opt/app/src
+      - lookup_node_modules:/opt/app/src/plugins/lookup/node_modules/
       - ./package.json:/opt/package.json
       - ./package-lock.json:/opt/package-lock.json
       - ./.env:/opt/app/.env
@@ -32,7 +33,8 @@ services:
     networks:
       - strapi-rpb
     depends_on:
-      - strapi-rpbDB
+      strapi-rpbDB:
+        condition: service_healthy
 
   strapi-rpbDB:
     container_name: strapi-rpbDB
@@ -61,6 +63,11 @@ services:
       - 5434:5432
     networks:
       - strapi-rpb
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U strapi"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
 
   adminer:
     image: adminer
@@ -74,6 +81,7 @@ services:
 
 volumes:
   strapi-rpb-data:
+  lookup_node_modules:
 
 networks:
   strapi-rpb:
diff --git a/docker-compose.yml b/docker-compose.yml
index d644bde..3e7a089 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,8 @@ services:
     networks:
       - strapi-rpb
     depends_on:
-      - strapi-rpbDB
+      strapi-rpbDB:
+        condition: service_healthy
     extra_hosts:
     - "host.docker.internal:host-gateway"
       
@@ -58,6 +59,11 @@ services:
       - 5434:5432
     networks:
       - strapi-rpb
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U strapi"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
 
   adminer:
     image: adminer