diff --git a/docs/content/doc/setup/docker-start-to-finish.md b/docs/content/doc/setup/docker-start-to-finish.md
index 183b72c5e..be83a33f1 100644
--- a/docs/content/doc/setup/docker-start-to-finish.md
+++ b/docs/content/doc/setup/docker-start-to-finish.md
@@ -62,8 +62,9 @@ services:
             - ./db:/var/lib/mysql
         restart: unless-stopped
         healthcheck:
-            test: ["CMD", "healthcheck.sh", "--su=vikunja", "--connect", "--innodb_initialized"]
+            test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD"]
             interval: 2s
+			start_period: 30s
 ```
 
 This defines two services, each with their own container:
diff --git a/docs/content/doc/setup/full-docker-example.md b/docs/content/doc/setup/full-docker-example.md
index 512505729..8b121c6d2 100644
--- a/docs/content/doc/setup/full-docker-example.md
+++ b/docs/content/doc/setup/full-docker-example.md
@@ -129,8 +129,9 @@ services:
       - ./db:/var/lib/mysql
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "healthcheck.sh", "--su=vikunja", "--connect", "--innodb_initialized"]
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD"]
       interval: 2s
+      start_period: 30s
 ```
 
 ## Example with Traefik 2
@@ -184,8 +185,9 @@ services:
       - ./db:/var/lib/mysql
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "healthcheck.sh", "--su=vikunja", "--connect", "--innodb_initialized"]
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD"]
       interval: 2s
+      start_period: 30s
 
 networks:
   web:
@@ -241,8 +243,9 @@ services:
       - ./db:/var/lib/mysql
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "healthcheck.sh", "--su=vikunja", "--connect", "--innodb_initialized"]
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD"]
       interval: 2s
+      start_period: 30s
   caddy:
     image: caddy
     restart: unless-stopped