diff --git a/passbolt/docker-compose.yml b/passbolt/docker-compose.yml
index afcbd80..1fde007 100644
--- a/passbolt/docker-compose.yml
+++ b/passbolt/docker-compose.yml
@@ -4,6 +4,10 @@ services:
     image: mariadb:10.11
     container_name: ${CONTAINER_NAME}-db
     restart: ${RESTART_POLICY}
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      timeout: 5s
+      retries: 10
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_MYSQL_ROOT_PASSWORD}
       - MYSQL_DATABASE=${DB_DATABASE}
@@ -28,7 +32,8 @@ services:
     container_name: ${CONTAINER_NAME}
     restart: ${RESTART_POLICY}
     depends_on:
-      - passbolt-db 
+      - passbolt-db:
+        condition: service_healthy
     environment:
       - APP_FULL_BASE_URL=https://${SUBDOMAIN}.${DOMAIN} 
       - DB_HOST=passbolt-db
@@ -67,7 +72,7 @@ services:
       - "traefik.http.routers.${ROUTER_NAME}.tls.certresolver=${CERTIFICATE_RESOLVER}"
       - "traefik.http.services.${ROUTER_NAME}.loadbalancer.server.port=80"
       - "traefik.docker.network=${TRAEFIK_NETWORK}"
-      
+
       - "traefik.http.routers.${ROUTER_NAME}.middlewares=passbolt-headers@docker"
       - "traefik.http.middlewares.passbolt-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
 
@@ -76,4 +81,5 @@ networks:
     name: traefik
     external: true
   internal_net:
-    driver: bridge
\ No newline at end of file
+    driver: bridge
+    name: passbolt_internal_net
\ No newline at end of file