diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1
index dd3be4bc..079ac5b5 100644
--- a/images/win/scripts/Installers/Install-MysqlCli.ps1
+++ b/images/win/scripts/Installers/Install-MysqlCli.ps1
@@ -7,10 +7,11 @@
 $InstallerName = "vcredist_x64.exe"
 $InstallerURI = "https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/${InstallerName}"
 $ArgumentList = ("/install", "/quiet", "/norestart")
+$InstallerSignatureThumbrint = "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
 
-Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList
+Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbrint
 
-## Downloading mysql
+# Downloading mysql
 [version]$MysqlVersion = (Get-ToolsetContent).mysql.version
 $MysqlVersionMajorMinor = $MysqlVersion.ToString(2)
 
@@ -20,20 +21,13 @@ if ($MysqlVersion.Build -lt 0) {
 }
 
 $MysqlVersionFull = $MysqlVersion.ToString()
-$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.zip"
+$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.msi"
 
-$MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip"
-
-# Expand the zip
-Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\"
-
-# Rename mysql-version to mysql folder
-$MysqlPath = "C:\mysql"
-Invoke-SBWithRetry -Command {
-    Rename-Item -Path "C:\mysql-${MysqlVersionFull}-winx64" -NewName $MysqlPath -ErrorAction Stop
-}
+Install-Binary -Url $MysqlVersionUrl -Name "mysql-${MysqlVersionFull}-winx64.msi" -ExpectedSignature (Get-ToolsetContent).mysql.signature
 
 # Adding mysql in system environment path
+$MysqlPath = $(Get-ChildItem -Path "C:\PROGRA~1\MySQL" -Directory)[0].FullName
+
 Add-MachinePathItem "${MysqlPath}\bin"
 
 Invoke-PesterTests -TestFile "Databases" -TestName "MySQL"
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 0837e56a..333cea42 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -460,7 +460,8 @@
         "version": "3.8"
     },
     "mysql": {
-        "version": "5.7"
+        "version": "5.7",
+        "signature": "DD34D7C71F160972DE0CE25B695A0D6A9C95BD91"
     },
     "mongodb": {
         "version": "5.0",
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index 51894eed..4135324a 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -396,7 +396,8 @@
         "version": "3.8"
     },
     "mysql": {
-        "version": "8.0"
+        "version": "8.0",
+        "signature": "DD34D7C71F160972DE0CE25B695A0D6A9C95BD91"
     },
     "mongodb": {
         "version": "5.0",