diff --git a/templates/database/mysql57-adonis.yml b/templates/database/mysql57-adonis.yml
index a9fe3cbd..e6636555 100644
--- a/templates/database/mysql57-adonis.yml
+++ b/templates/database/mysql57-adonis.yml
@@ -1,14 +1,15 @@
 services:
   database:
-    image: mysql:5.7
+    image: mysql/mysql-server:5.7
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USER-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks:
diff --git a/templates/database/mysql57.yml b/templates/database/mysql57.yml
index 91772dc2..6154d395 100644
--- a/templates/database/mysql57.yml
+++ b/templates/database/mysql57.yml
@@ -1,14 +1,15 @@
 services:
   database:
-    image: mysql:5.7
+    image: mysql/mysql-server:5.7
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USERNAME-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks:
diff --git a/templates/database/mysql8-adonis.yml b/templates/database/mysql8-adonis.yml
index 2c67c740..f7b442f9 100644
--- a/templates/database/mysql8-adonis.yml
+++ b/templates/database/mysql8-adonis.yml
@@ -1,15 +1,16 @@
 services:
   database:
-    image: mysql:8.0
+    image: mysql/mysql-server:8.0
     command: --default-authentication-plugin=mysql_native_password
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USER-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks:
diff --git a/templates/database/mysql8.yml b/templates/database/mysql8.yml
index 9b743196..096d149d 100644
--- a/templates/database/mysql8.yml
+++ b/templates/database/mysql8.yml
@@ -1,15 +1,16 @@
 services:
   database:
-    image: mysql:8.0
+    image: mysql/mysql-server:8.0
     command: --default-authentication-plugin=mysql_native_password
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USERNAME-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks: