diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh
new file mode 100644
index 00000000..9f2988a8
--- /dev/null
+++ b/images/linux/scripts/installers/postgresql.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+################################################################################
+##  File:  postgresql.sh
+##  Desc:  Installs Postgresql
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+echo "Install libpq-dev"
+apt-get install libpq-dev
+
+echo "Install Postgresql Client"
+apt-get install postgresql-client
+
+DocumentInstalledItem "$(psql -V 2>&1 | cut -d ' ' -f 1,2,3)"
\ No newline at end of file
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 73d96e83..30f25d9a 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -153,6 +153,7 @@
                 "{{template_dir}}/scripts/installers/phantomjs.sh",
                 "{{template_dir}}/scripts/installers/1604/php.sh",
                 "{{template_dir}}/scripts/installers/pollinate.sh",
+                "{{template_dir}}/scripts/installers/postgresql.sh",
                 "{{template_dir}}/scripts/installers/1604/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index dcf2ae54..2b128c0c 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -156,6 +156,7 @@
                 "{{template_dir}}/scripts/installers/phantomjs.sh",
                 "{{template_dir}}/scripts/installers/1804/php.sh",
                 "{{template_dir}}/scripts/installers/pollinate.sh",
+                "{{template_dir}}/scripts/installers/postgresql.sh",
                 "{{template_dir}}/scripts/installers/1804/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 1b411672..46792679 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -355,6 +355,12 @@
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -774,6 +780,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-Vcpkg.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-VSWhere.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
diff --git a/images/win/scripts/Installers/Install-VSWhere.ps1 b/images/win/scripts/Installers/Install-VSWhere.ps1
new file mode 100644
index 00000000..d6098654
--- /dev/null
+++ b/images/win/scripts/Installers/Install-VSWhere.ps1
@@ -0,0 +1,6 @@
+################################################################################
+##  File:  Install-VSWhere.ps1
+##  Desc:  Install latest stable version of VSWhere
+################################################################################
+
+choco install vswhere -y
diff --git a/images/win/scripts/Installers/Validate-VSWhere.ps1 b/images/win/scripts/Installers/Validate-VSWhere.ps1
new file mode 100644
index 00000000..7b41519c
--- /dev/null
+++ b/images/win/scripts/Installers/Validate-VSWhere.ps1
@@ -0,0 +1,25 @@
+################################################################################
+##  File:  Validate-VSWhere.ps1
+##  Desc:  Validate vswhere
+################################################################################
+
+if(Get-Command -Name 'vswhere')
+{
+    Write-Host "vswhere $(vswhere) on path"
+}
+else
+{
+    Write-Host "vswhere is not on path"
+    exit 1
+}
+
+# Adding description of the software to Markdown
+$SoftwareName = "VSWhere"
+$VswhereVersion = $(vswhere)
+
+$Description = @"
+_Version_: $VswhereVersion<br/>
+* PATH: contains location of vswhere.exe
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
\ No newline at end of file