diff --git a/docker-compose.yml b/docker-compose.yml
index b89dd74..0347af7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,9 +4,9 @@ services:
     image: nextcloud:${NC_VERSION}
     restart: unless-stopped
     depends_on:
-      - db
+      - mariadb
     environment:
-      - MYSQL_HOST=db
+      - MYSQL_HOST=mariadb
       - MYSQL_DATABASE=${NC_DATABASE_NAME}
       - MYSQL_USER=${NC_DATABASE_USER}
       - MYSQL_PASSWORD=${NC_DATABASE_PASS}
@@ -41,7 +41,7 @@ services:
     volumes:
       - ./data/nextcloud:/var/www/html
 
-  db:
+  mariadb:
     image: mariadb:${DB_VERSION}
     restart: unless-stopped
     environment:
@@ -49,6 +49,12 @@ services:
       - MYSQL_DATABASE=${NC_DATABASE_NAME}
       - MYSQL_USER=${NC_DATABASE_USER}
       - MYSQL_PASSWORD=${NC_DATABASE_PASS}
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      start_period: 30s
+      interval: 5s
+      timeout: 3s
+      retries: 3
     networks:
       - internal
     volumes: