diff --git a/docker-compose.yml b/docker-compose.yml
index 0c92fc9b0e90de05b85c948cabab1d5b3874e1d5..f9fe73a132cc8e3b4c9284b740d4a4bf723c0595 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,8 @@ services:
     volumes:
       - '.:/rest'
     depends_on:
-      - mysql
+      mysql:
+        condition: service_healthy
   
   mysql:
     image: mysql:latest
@@ -21,6 +22,12 @@ services:
     env_file: .env
     volumes:
       - ./mysql:/var/lib/mysql
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 55
 
   phpmyadmin:
     image: phpmyadmin:latest
@@ -29,4 +36,5 @@ services:
     ports:
       - 5051:80
     depends_on:
-      - mysql
\ No newline at end of file
+      mysql:
+        condition: service_healthy
\ No newline at end of file