diff --git a/default.yml b/default.yml
index e074627..c1da695 100644
--- a/default.yml
+++ b/default.yml
@@ -10,9 +10,10 @@ services:
       - database:/var/lib/mysql
     restart: always
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     environment:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: chevereto
diff --git a/dev.yml b/dev.yml
index d987380..c33d20a 100644
--- a/dev.yml
+++ b/dev.yml
@@ -12,9 +12,10 @@ services:
       - ${DB_PORT}:3306
     restart: always
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     environment:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: chevereto
@@ -52,7 +53,7 @@ services:
       CHEVERETO_ASSET_STORAGE_TYPE: local
       CHEVERETO_ASSET_STORAGE_URL: ${URL}images/_assets/
       CHEVERETO_ASSET_STORAGE_BUCKET: /var/www/html/images/_assets/
-      CHEVERETO_ENCRYPTION_KEY: ${ENCRYPTION_KEY}
+      CHEVERETO_ENCRYPTION_KEY:
 
 volumes:
   database:
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
index 3c0117f..e7142f6 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -10,9 +10,10 @@ services:
       - database:/var/lib/mysql
     restart: always
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     environment:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: chevereto
diff --git a/docs/PURE-DOCKER.md b/docs/PURE-DOCKER.md
index 5153172..fe90a1b 100644
--- a/docs/PURE-DOCKER.md
+++ b/docs/PURE-DOCKER.md
@@ -77,9 +77,10 @@ services:
       - database:/var/lib/mysql
     restart: always
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     environment:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: chevereto