diff --git a/docker-compose.yml b/docker-compose.yml
index 721ec60..21b1639 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   iiko-db:
     image: mariadb:12.2.2
-    container_name: iiko-mariadb
+    container_name: iiko-db
     restart: unless-stopped
     user: "1000:1000"
     environment:
@@ -17,18 +17,25 @@ services:
     volumes:
       - $PWD/app/mariadb:/var/lib/mysql
       - /etc/localtime:/etc/localtime:ro
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   iiko-pma:
     image: phpmyadmin:5.2.3
-    container_name: iiko-phpmyadmin
+    container_name: iiko-pma
     depends_on:
-      - iiko-db
+      iiko-db:
+        condition: service_healthy
     restart: unless-stopped
     environment:
       PMA_HOST: iiko-db
       PMA_PORT: 3306
       UPLOAD_LIMIT: 10M
-      PMA_ABSOLUTE_URI: https://phpmyadmin.dev.xserver.su/
+      # PMA_ABSOLUTE_URI: https://phpmyadmin.dev.xserver.su/
       TZ: Europe/Moscow
     ports:
       - "7102:80"
@@ -55,8 +62,10 @@ services:
     ports:
       - "7104:7104"
     depends_on:
-      - iiko-db
-      - iiko-redis
+      iiko-db:
+        condition: service_healthy
+      iiko-redis:
+        condition: service_started
     environment:
       DATABASE__HOST: iiko-db
       DATABASE__PORT: 3306