diff --git a/dev/mssql/latest/docker-compose.yml b/dev/mssql/latest/docker-compose.yml
index c27fb1462..b0981eec0 100644
--- a/dev/mssql/latest/docker-compose.yml
+++ b/dev/mssql/latest/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     volumes:
       - mssql-latest:/var/opt/mssql
     healthcheck:
-      test: ["CMD", "/opt/mssql-tools/bin/sqlcmd", "-S", "localhost", "-U", "SA", "-P", "Password12!", "-l", "30", "-Q", "SELECT 1"]
+      test: ["CMD", "/opt/mssql-tools18/bin/sqlcmd", "-S", "localhost", "-No", "-U", "SA", "-P", "Password12!", "-l", "30", "-Q", "SELECT 1"]
       interval: 3s
       timeout: 1s
       retries: 10
diff --git a/dev/mssql/latest/start.sh b/dev/mssql/latest/start.sh
index ae24955df..ec684599e 100755
--- a/dev/mssql/latest/start.sh
+++ b/dev/mssql/latest/start.sh
@@ -8,6 +8,6 @@ docker compose -p sequelize-mssql-latest up -d
 ./../../wait-until-healthy.sh sequelize-mssql-latest
 
 docker exec sequelize-mssql-latest \
-  /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE sequelize_test; ALTER DATABASE sequelize_test SET READ_COMMITTED_SNAPSHOT ON;"
+  /opt/mssql-tools18/bin/sqlcmd -S localhost -No -U SA -P "Password12!" -Q "CREATE DATABASE sequelize_test; ALTER DATABASE sequelize_test SET READ_COMMITTED_SNAPSHOT ON;"
 
 DIALECT=mssql ts-node ../../check-connection.ts
diff --git a/dev/wait-until-healthy.sh b/dev/wait-until-healthy.sh
index 4592bf948..80815069b 100755
--- a/dev/wait-until-healthy.sh
+++ b/dev/wait-until-healthy.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 1 ]; then
   exit 1
 fi
 
-for _ in {1..75}
+for _ in {1..50}
 do
   state=$(docker inspect -f '{{ .State.Health.Status }}' $1 2>&1)
   return_code=$?
@@ -16,5 +16,5 @@ do
   sleep 0.4
 done
 
->&2 echo "Timeout of 30s exceeded when waiting for container to be healthy: $1"
+>&2 echo "Timeout of 20s exceeded when waiting for container to be healthy: $1"
 exit 1