diff --git a/roles/server_docker-attendize/templates/docker-compose.yml.j2 b/roles/server_docker-attendize/templates/docker-compose.yml.j2
index 8b8ea942..1af999f3 100644
--- a/roles/server_docker-attendize/templates/docker-compose.yml.j2
+++ b/roles/server_docker-attendize/templates/docker-compose.yml.j2
@@ -38,7 +38,7 @@ services:
     volumes:
       - database:/var/lib/mysql
     healthcheck:
-      test: "/usr/bin/mysql --user=attendize --password={{attendize_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=attendize --password={{attendize_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5
diff --git a/roles/server_docker-gitea/templates/docker-compose.yml.j2 b/roles/server_docker-gitea/templates/docker-compose.yml.j2
index 890b7e0b..d6b911f6 100644
--- a/roles/server_docker-gitea/templates/docker-compose.yml.j2
+++ b/roles/server_docker-gitea/templates/docker-compose.yml.j2
@@ -45,7 +45,7 @@ services:
     volumes:
       - database:/var/lib/mysql
     healthcheck:
-      test: "/usr/bin/mysql --user=gitea --password={{gitea_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=gitea --password={{gitea_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5
diff --git a/roles/server_docker-mailu/templates/docker-compose.yml.j2 b/roles/server_docker-mailu/templates/docker-compose.yml.j2
index d35b882d..5df9cb94 100644
--- a/roles/server_docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/server_docker-mailu/templates/docker-compose.yml.j2
@@ -33,7 +33,7 @@ services:
     volumes:
       - database:/var/lib/mysql
     healthcheck:
-      test: "/usr/bin/mysql --user=mailu --password={{mailu_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=mailu --password={{mailu_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5
diff --git a/roles/server_docker-nextcloud/templates/docker-compose.yml.j2 b/roles/server_docker-nextcloud/templates/docker-compose.yml.j2
index 106780c1..f9dc1253 100644
--- a/roles/server_docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/server_docker-nextcloud/templates/docker-compose.yml.j2
@@ -30,7 +30,7 @@ services:
       - database:/var/lib/mysql
     restart: always
     healthcheck:
-      test: "/usr/bin/mysql --user=nextcloud --password={{nextcloud_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=nextcloud --password={{nextcloud_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5
diff --git a/roles/server_docker-pixelfed/templates/docker-compose.yml.j2 b/roles/server_docker-pixelfed/templates/docker-compose.yml.j2
index 239830b9..28c083e1 100644
--- a/roles/server_docker-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/server_docker-pixelfed/templates/docker-compose.yml.j2
@@ -46,7 +46,7 @@ services:
     volumes:
       - database:/var/lib/mysql
     healthcheck:
-      test: "/usr/bin/mysql --user=pixelfed --password={{pixelfed_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=pixelfed --password={{pixelfed_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5
diff --git a/roles/server_docker-wordpress/templates/docker-compose.yml.j2 b/roles/server_docker-wordpress/templates/docker-compose.yml.j2
index f415e36d..689c16c1 100644
--- a/roles/server_docker-wordpress/templates/docker-compose.yml.j2
+++ b/roles/server_docker-wordpress/templates/docker-compose.yml.j2
@@ -33,7 +33,7 @@ services:
     volumes:
       - database:/var/lib/mysql
     healthcheck:
-      test: "/usr/bin/mysql --user=wordpress --password={{wordpress_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=wordpress --password={{wordpress_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5
diff --git a/roles/server_docker-yourls/templates/docker-compose.yml.j2 b/roles/server_docker-yourls/templates/docker-compose.yml.j2
index 0c0c21c4..4f0a7cc5 100644
--- a/roles/server_docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/server_docker-yourls/templates/docker-compose.yml.j2
@@ -34,7 +34,7 @@ services:
     volumes:
       - database:/var/lib/mysql
     healthcheck:
-      test: "/usr/bin/mysql --user=yourls --password={{yourls_database_password}} --execute \"SHOW DATABASES;\""
+      test: "/usr/bin/mariadb --user=yourls --password={{yourls_database_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
       timeout: 1s
       retries: 5