diff --git a/modules/app_stack/scripts/mysql_setup.sh.tftpl b/modules/app_stack/scripts/mysql_setup.sh.tftpl
index 75ae358..2c1c21e 100644
--- a/modules/app_stack/scripts/mysql_setup.sh.tftpl
+++ b/modules/app_stack/scripts/mysql_setup.sh.tftpl
@@ -113,8 +113,8 @@ docker run -d \
   mysql:8.4.8
 
 MYSQL_READY=false
-for i in $(seq 1 30); do
-  if docker exec mysql-server mysqladmin ping -uroot -p"$DB_ROOT_PASS" 2>/dev/null; then
+for i in $(seq 1 90); do
+  if docker exec mysql-server mysql -uroot -p"$DB_ROOT_PASS" -e "SELECT 1" >/dev/null 2>&1; then
     MYSQL_READY=true
     break
   fi
@@ -122,7 +122,7 @@ for i in $(seq 1 30); do
 done
 
 if [ "$MYSQL_READY" != "true" ]; then
-  echo "MySQL container did not become ready within 60 seconds." >&2
+  echo "MySQL container did not become ready for authenticated root queries within 180 seconds." >&2
   docker logs --tail 100 mysql-server >&2 || true
   exit 1
 fi