diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1
index 9547005a..3f54db21 100644
--- a/images/win/scripts/Installers/Install-MysqlCli.ps1
+++ b/images/win/scripts/Installers/Install-MysqlCli.ps1
@@ -3,11 +3,6 @@
 ##  Desc:  Install Mysql CLI
 ################################################################################
 
-## Downloading mysql jar
-$MysqlVersionName = "mysql-5.7.21-winx64"
-$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-5.7/${MysqlVersionName}.zip"
-$MysqlPath = "C:\$MysqlVersionName\bin"
-
 # Installing visual c++ redistibutable package.
 $InstallerName = "vcredist_x64.exe"
 $InstallerURI = "https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/${InstallerName}"
@@ -15,16 +10,25 @@ $ArgumentList = ("/install", "/quiet", "/norestart")
 
 Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList
 
-# MySQL disabled TLS 1.0 support on or about Jul-14-2018.  Need to make sure TLS 1.2 is enabled.
-[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
+## Downloading mysql
+if (Test-IsWin22) {
+    $MysqlVersionName = "mysql-8.0.26-winx64"
+    $MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-8/${MysqlVersionName}.zip"
+} else {
+    $MysqlVersionName = "mysql-5.7.35-winx64"
+    $MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-5.7/${MysqlVersionName}.zip"
+}
 
-# Get the latest mysql command line tools .
-$mysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip"
+$MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip"
 
 # Expand the zip
-Extract-7Zip -Path $mysqlArchPath -DestinationPath "C:\"
+Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\"
+
+# Rename mysql-version to mysql folder
+$MysqlPath = "C:\mysql"
+Rename-Item -Path "C:\${MysqlVersionName}" -NewName $MysqlPath
 
 # Adding mysql in system environment path
-Add-MachinePathItem $mysqlPath
+Add-MachinePathItem "${MysqlPath}\bin"
 
-Invoke-PesterTests -TestFile "Databases" -TestName "MySQL"
\ No newline at end of file
+Invoke-PesterTests -TestFile "Databases" -TestName "MySQL"