diff --git a/images/win/vs2017-Server2016-Azure.json b/images/win/Windows2016-Azure.json
similarity index 100%
rename from images/win/vs2017-Server2016-Azure.json
rename to images/win/Windows2016-Azure.json
diff --git a/images/win/vs2019-Server2019-Azure.json b/images/win/Windows2019-Azure.json
similarity index 100%
rename from images/win/vs2019-Server2019-Azure.json
rename to images/win/Windows2019-Azure.json
diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
index 93d9d1ad..390e0411 100644
--- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
+++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
@@ -50,5 +50,10 @@ setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M;
 setx GeckoWebDriver "C:\SeleniumWebDrivers\GeckoDriver" /M;
 setx ChromeWebDriver "C:\SeleniumWebDrivers\ChromeDriver" /M;
 
+$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
+$PathValue = Get-ItemPropertyValue -Path $reg -Name 'Path';
+$PathValue += ";C:\SeleniumWebDrivers\ChromeDriver";
+Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;
+
 exit 0;