diff --git a/compose.mariadb.yml b/compose.mariadb.yml
index fa29253..7d5d187 100644
--- a/compose.mariadb.yml
+++ b/compose.mariadb.yml
@@ -34,9 +34,9 @@ services:
         backupbot.restore.post-hook: 'mysql -u root -p"$$(cat /run/secrets/db_root_password)" $${MYSQL_DATABASE} < /var/lib/mysql/backup.sql'
     healthcheck:
       test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)"  ping']
-      interval: 5s
+      interval: 30s
       timeout: 10s
-      retries: 0
+      retries: 30
       start_period: 1m
 
 secrets:
diff --git a/compose.yml b/compose.yml
index 5e8805c..696c373 100644
--- a/compose.yml
+++ b/compose.yml
@@ -30,9 +30,10 @@ services:
       - vaultwarden_data:/data
     healthcheck:
       test: curl -f http://localhost/alive || exit 1
-      interval: 5s
-      timeout: 3s
-      retries: 10
+      interval: 30s
+      timeout: 10s
+      retries: 30
+      start_period: 1m
     deploy:
       restart_policy:
         condition: on-failure