diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1
index abf234cb..eb6cea70 100644
--- a/images/win/scripts/Installers/Install-Firefox.ps1
+++ b/images/win/scripts/Installers/Install-Firefox.ps1
@@ -61,5 +61,6 @@ Remove-Item -Path $DestFile -Force
 
 Write-Host "Setting the environment variables"
 Add-MachinePathItem -PathItem $FireFoxDriverPath
+setx GeckoWebDriver "$FirefoxDriverPath" /M;
 
 exit 0
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1
index 9a68c72b..a332e69f 100644
--- a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1
+++ b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1
@@ -4,9 +4,13 @@
 ################################################################################
 
 $IEDriverPath = $env:IEWebDriver
+Write-Host "IEDriverPath $IEDriverPath"
 $GeckoDriverPath = $env:GeckoWebDriver
+Write-Host "GeckoDriverPath $GeckoDriverPath"
 $ChromeDriverPath = $env:ChromeWebDriver
+Write-Host "ChromeDriverPath $ChromeDriverPath"
 $EdgeDriverPath = $env:EdgeWebDriver
+Write-Host "EdgeDriverPath $EdgeDriverPath"
 
 if (
 	($IEDriverPath -like "C:\SeleniumWebDrivers\IEDriver") -and