diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/win/scripts/Installers/Install-PostgreSQL.ps1
index c0765c654..ee7177c6c 100644
--- a/images/win/scripts/Installers/Install-PostgreSQL.ps1
+++ b/images/win/scripts/Installers/Install-PostgreSQL.ps1
@@ -9,11 +9,17 @@ Set-SystemVariable -SystemVariable PGUSER -Value $pgUser
 Set-SystemVariable -SystemVariable PGPASSWORD -Value $pgPwd
 
 #Install latest PostgreSQL
-Choco-Install -PackageName postgresql -ArgumentList "--params", "/Password:$pgPwd", "--params-global", "--debug", "--verbose"
+Choco-Install -PackageName postgresql -ArgumentList "--params", "/Password:$pgPwd", "/NoPath", "--params-global", "--debug", "--verbose"
 
 #Get Path to pg_ctl.exe
 $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName
+
 #Parse output of command above to obtain pure path
 $pgBin = Split-Path -Path $pgPath.split('"')[1]
-#Added PostgreSQL bin path into PATH variable
-Add-MachinePathItem $pgBin
+$pgRoot = Split-Path -Path $pgPath.split('"')[5]
+$pgData = Join-Path $pgRoot "data"
+
+#Added PostgreSQL environment variable
+Set-SystemVariable -SystemVariable PGBIN -Value $pgBin
+Set-SystemVariable -SystemVariable PGROOT -Value $pgRoot
+Set-SystemVariable -SystemVariable PGDATA -Value $pgData
diff --git a/images/win/scripts/Installers/Validate-PostgreSQL.ps1 b/images/win/scripts/Installers/Validate-PostgreSQL.ps1
index 14cdc2981..a5eee18f2 100644
--- a/images/win/scripts/Installers/Validate-PostgreSQL.ps1
+++ b/images/win/scripts/Installers/Validate-PostgreSQL.ps1
@@ -1,4 +1,5 @@
-$pgReady = Start-Process -FilePath pg_isready -Wait -PassThru
+$pgReadyPath = Join-Path $PGBIN "pg_isready.exe"
+$pgReady = Start-Process -FilePath $pgReadyPath -Wait -PassThru
 $exitCode = $pgReady.ExitCode
 
 if ($exitCode -eq 0)
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1
index ed16fab42..0e993579e 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1
@@ -9,6 +9,7 @@ function Get-PostgreSQLMarkdown
         Version = $pgVersion
         UserName = $env:PGUSER
         Password = $env:PGPASSWORD
+        EnvironmentVariables = "PGBIN=$env:PGBIN; <br> PGDATA=$env:PGDATA; <br> PGROOT=$env:PGROOT"
         Path = $pgRoot
         ServiceName = $pgService.Name
         ServiceStatus = $pgService.State