diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 6f749dbed..944bed8c6 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -401,7 +401,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1"
             ]
         },
         {
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index c1dc9252d..c8c308478 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -364,7 +364,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1"
             ]
         },
         {
diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1
index aac913e71..44b58abb7 100644
--- a/images/win/scripts/Installers/Install-Chrome.ps1
+++ b/images/win/scripts/Installers/Install-Chrome.ps1
@@ -18,7 +18,7 @@ $GoogleSvcs | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"};
 
 $regGoogleUpdatePath = "HKLM:\SOFTWARE\Policies\Google\Update";
 $regGoogleUpdateChrome = "HKLM:\SOFTWARE\Policies\Google\Chrome";
-($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object {  
+($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object {
     New-Item -Path $_ -Force;
 }
 
@@ -39,4 +39,44 @@ $regGoogleParameters | ForEach-Object {
     New-ItemProperty @Arguments;
 }
 
+# Reinstall Chrome Web Driver
+Write-Host "Install Chrome WebDriver"
+$DestinationPath = "$($env:SystemDrive)\";
+$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver";
 
+if (-not (Test-Path -Path $ChromeDriverPath)) {
+    New-Item -Path $ChromeDriverPath -ItemType "directory"
+}
+
+$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
+$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)';
+[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion;
+Write-Host "Chrome version: [$ChromeVersion]";
+
+$ChromeDriverVersionUri = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)";
+Write-Host "Chrome driver version Uri [$ChromeDriverVersionUri]";
+Write-Host "Getting the Chrome driver version...";
+$ChromeDriverVersion = Invoke-WebRequest -Uri $ChromeDriverVersionUri;
+Write-Host "Current Chrome driver version: [$ChromeDriverVersion]";
+
+$ChromeDriverZipDownloadUri = "https://chromedriver.storage.googleapis.com/$($ChromeDriverVersion.ToString())/chromedriver_win32.zip";
+Write-Host "Chrome driver zip file download Uri: [$ChromeDriverZipDownloadUri]";
+
+$DestFile= "$ChromeDriverPath\chromedriver_win32.zip";
+$ChromeDriverVersion.Content | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force;
+
+Write-Host "Chrome driver download....";
+Invoke-WebRequest -Uri $ChromeDriverZipDownloadUri -OutFile $DestFile;
+
+Write-Host "Chrome driver install....";
+Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force;
+Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force;
+
+Write-Host "Setting the environment variables"
+
+setx ChromeWebDriver "$ChromeDriverPath" /M;
+
+$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
+$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path';
+$PathValue += ";$ChromeDriverPath\";
+Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;
diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1
index e5a641a1b..b84f0fc14 100644
--- a/images/win/scripts/Installers/Install-Edge.ps1
+++ b/images/win/scripts/Installers/Install-Edge.ps1
@@ -4,3 +4,38 @@
 ################################################################################
 
 choco install microsoft-edge -y
+
+# Install Microsoft Edge Web Driver
+Write-Host "Install Edge WebDriver"
+$DestinationPath = "$($env:SystemDrive)\";
+
+$EdgeDriverPath = "${DestinationPath}SeleniumWebDrivers\EdgeDriver"
+if (-not (Test-Path -Path $EdgeDriverPath)) {
+    New-Item -Path $EdgeDriverPath -ItemType "directory"
+}
+
+$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
+$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)'
+[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion
+$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)"
+$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt"
+Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile
+
+Write-Host "Microsoft Edge driver download started"
+$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile
+$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip"
+$DestFile = "$EdgeDriverPath\edgedriver_win64.zip"
+Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile
+
+Write-Host "Microsoft Edge driver installation started"
+Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force
+Remove-Item -Path $DestFile -Force
+
+Write-Host "Setting the environment variables"
+
+setx EdgeWebDriver "$EdgeDriverPath" /M;
+
+$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
+$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path';
+$PathValue += ";$EdgeDriverPath\";
+Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;
diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1
index 7408b7289..78e886cd7 100644
--- a/images/win/scripts/Installers/Install-Firefox.ps1
+++ b/images/win/scripts/Installers/Install-Firefox.ps1
@@ -25,3 +25,46 @@ pref("app.update.enabled", false);' -ItemType file -force
 $firefoxPreferencesFolder = Join-Path $firefoxDirectoryPath "defaults\pref"
 New-Item -path $firefoxPreferencesFolder -Name 'local-settings.js' -Value 'pref("general.config.obscure_value", 0);
 pref("general.config.filename", "mozilla.cfg");' -ItemType file -force
+
+# Install Firefox gecko Web Driver
+Write-Host "Install Firefox WebDriver"
+$DestinationPath = "$($env:SystemDrive)\";
+$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
+
+$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest"
+$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1
+
+$geckodriverVersion = $geckodriverJson.tag_name
+Write-Host "Geckodriver version: $geckodriverVersion"
+
+$DriversZipFile = $geckodriverWindowsAsset.name
+Write-Host "Selenium drivers download and install..."
+
+$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver"
+$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force;
+
+# Install Firefox Web Driver
+Write-Host "FireFox driver download...."
+if (-not (Test-Path -Path $FireFoxDriverPath)) {
+    New-Item -Path $FireFoxDriverPath -ItemType "directory"
+}
+
+$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile
+$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url
+try{
+    Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile
+} catch {
+    Write-Error "[!] Failed to download $DriversZipFile"
+    exit 1
+}
+
+Write-Host "FireFox driver install...."
+Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force
+Remove-Item -Path $DestFile -Force
+
+
+Write-Host "Setting the environment variables"
+Add-MachinePathItem -PathItem $FireFoxDriverPath
+setx GeckoWebDriver "$FirefoxDriverPath" /M;
+
+exit 0
diff --git a/images/win/scripts/Installers/Install-IEWebDriver.ps1 b/images/win/scripts/Installers/Install-IEWebDriver.ps1
new file mode 100644
index 000000000..7dfd8b42f
--- /dev/null
+++ b/images/win/scripts/Installers/Install-IEWebDriver.ps1
@@ -0,0 +1,32 @@
+################################################################################
+##  File:  Install-SeleniumWebDrivers.ps1
+##  Desc:  Install Selenium Web Drivers
+################################################################################
+$DestinationPath = "$($env:SystemDrive)\";
+$DriversZipFile = "SeleniumWebDrivers.zip"
+Write-Host "Destination path: [$DestinationPath]";
+Write-Host "Selenium drivers download and install...";
+try {
+    Invoke-WebRequest -UseBasicParsing -Uri "https://seleniumwebdrivers.blob.core.windows.net/seleniumwebdrivers/${DriversZipFile}" -OutFile $DriversZipFile;
+}
+catch {
+    Write-Error "[!] Failed to download $DriversZipFile";
+    exit 1;
+}
+
+$TempSeleniumDir = Join-Path $Env:TEMP "SeleniumWebDrivers"
+Expand-Archive -Path $DriversZipFile -DestinationPath $Env:TEMP -Force;
+Remove-Item $DriversZipFile;
+
+$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
+$IEDriverPathTemp = Join-Path $TempSeleniumDir 'IEDriver'
+
+if (-not (Test-Path -Path $SeleniumWebDriverPath)) {
+    New-Item -Path $SeleniumWebDriverPath -ItemType "directory"
+}
+
+Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath
+
+Write-Host "Setting the environment variables"
+
+setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M;
diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
deleted file mode 100644
index 2e5368ff1..000000000
--- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
+++ /dev/null
@@ -1,135 +0,0 @@
-################################################################################
-##  File:  Install-SeleniumWebDrivers.ps1
-##  Desc:  Install Selenium Web Drivers
-################################################################################
-$DestinationPath = "$($env:SystemDrive)\";
-$DriversZipFile = "SeleniumWebDrivers.zip"
-Write-Host "Destination path: [$DestinationPath]";
-Write-Host "Selenium drivers download and install...";
-try {
-    Invoke-WebRequest -UseBasicParsing -Uri "https://seleniumwebdrivers.blob.core.windows.net/seleniumwebdrivers/${DriversZipFile}" -OutFile $DriversZipFile;
-}
-catch {
-    Write-Error "[!] Failed to download $DriversZipFile";
-    exit 1;
-}
-
-$TempSeleniumDir = Join-Path $Env:TEMP "SeleniumWebDrivers"
-Expand-Archive -Path $DriversZipFile -DestinationPath $Env:TEMP -Force;
-Remove-Item $DriversZipFile;
-
-$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
-$IEDriverPathTemp = Join-Path $TempSeleniumDir 'IEDriver'
-
-if (-not (Test-Path -Path $SeleniumWebDriverPath)) {
-    New-Item -Path $SeleniumWebDriverPath -ItemType "directory"
-}
-
-Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath
-
-
-# Reinstall Chrome Web Driver
-$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver";
-
-if (-not (Test-Path -Path $ChromeDriverPath)) {
-    New-Item -Path $ChromeDriverPath -ItemType "directory"
-}
-
-$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
-$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)';
-[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion;
-Write-Host "Chrome version: [$ChromeVersion]";
-
-$ChromeDriverVersionUri = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)";
-Write-Host "Chrome driver version Uri [$ChromeDriverVersionUri]";
-Write-Host "Getting the Chrome driver version...";
-$ChromeDriverVersion = Invoke-WebRequest -Uri $ChromeDriverVersionUri;
-Write-Host "Current Chrome driver version: [$ChromeDriverVersion]";
-
-$ChromeDriverZipDownloadUri = "https://chromedriver.storage.googleapis.com/$($ChromeDriverVersion.ToString())/chromedriver_win32.zip";
-Write-Host "Chrome driver zip file download Uri: [$ChromeDriverZipDownloadUri]";
-
-$DestFile= "$ChromeDriverPath\chromedriver_win32.zip";
-$ChromeDriverVersion.Content | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force;
-
-Write-Host "Chrome driver download....";
-Invoke-WebRequest -Uri $ChromeDriverZipDownloadUri -OutFile $DestFile;
-
-Write-Host "Chrome driver install....";
-Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force;
-Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force;
-
-# Install Microsoft Edge Web Driver
-Write-Host "Microsoft Edge driver download...."
-$EdgeDriverPath = "${DestinationPath}SeleniumWebDrivers\EdgeDriver"
-if (-not (Test-Path -Path $EdgeDriverPath)) {
-    New-Item -Path $EdgeDriverPath -ItemType "directory"
-}
-
-$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)'
-[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion
-$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)"
-$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt"
-Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile
-
-$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile
-$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip"
-$DestFile = "$EdgeDriverPath\edgedriver_win64.zip"
-Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile
-
-Write-Host "Microsoft Edge driver install...."
-Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force
-Remove-Item -Path $DestFile -Force
-
-Write-Host "Setting the environment variables"
-
-setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M;
-setx ChromeWebDriver "$ChromeDriverPath" /M;
-setx EdgeWebDriver "$EdgeDriverPath" /M;
-
-$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
-$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path';
-$PathValue += ";$ChromeDriverPath\";
-$PathValue += ";$EdgeDriverPath\";
-Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;
-
-# Install Firefox gecko Web Driver
-Write-Host "Install Firefox WebDriver"
-
-$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest"
-$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1
-
-$geckodriverVersion = $geckodriverJson.tag_name
-Write-Host "Geckodriver version: $geckodriverVersion"
-
-$DriversZipFile = $geckodriverWindowsAsset.name
-Write-Host "Selenium drivers download and install..."
-
-$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver"
-$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force;
-
-# Install Firefox Web Driver
-Write-Host "FireFox driver download...."
-if (-not (Test-Path -Path $FireFoxDriverPath)) {
-    New-Item -Path $FireFoxDriverPath -ItemType "directory"
-}
-
-$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile
-$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url
-try{
-    Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile
-} catch {
-    Write-Error "[!] Failed to download $DriversZipFile"
-    exit 1
-}
-
-Write-Host "FireFox driver install...."
-Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force
-Remove-Item -Path $DestFile -Force
-
-
-Write-Host "Setting the environment variables"
-Add-MachinePathItem -PathItem $FireFoxDriverPath
-setx GeckoWebDriver "$FirefoxDriverPath" /M;
-
-exit 0