diff --git a/docker-compose.yml b/docker-compose.yml
index 694ce1ad..ddf442bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -556,7 +556,10 @@ services:
   castopod:
     container_name: castopod
     depends_on:
-      - mariadb
+      mariadb:
+        condition: service_healthy
+        required: true
+        restart: true
     environment:
       MYSQL_DATABASE: castopod
       MYSQL_USER: castopod
@@ -1704,7 +1707,7 @@ services:
     container_name: hortusfox
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
         restart: true
     environment:
@@ -3027,6 +3030,11 @@ services:
       PUID: 1000
       TZ: America/New_York
       MYSQL_PASSWORD: VQU23wHKRNmfpAPt5E9BxMaSGJdWjLuz
+    healthcheck:
+      test: "/usr/bin/mariadb -u root -p${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} -e \"SHOW DATABASES;\""
+      interval: 10s
+      timeout: 5s
+      retries: 3
     hostname: Rinoa
     image: ghcr.io/linuxserver/mariadb
     networks:
@@ -6081,7 +6089,7 @@ services:
     container_name: wallabag
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
         restart: true
       redis: