diff --git a/README.md b/README.md
index 79c92534..5ccfdf2e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # GitHub Actions Virtual Environments
-This repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners. To file bug reports, or request that tools be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose). To build a VM machine from this repo's source, see the [instructions](./help/CreateImageAndAzureResources.md).
+This repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners, as well as the VM images of [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. To file bug reports, or request that tools be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose). To build a VM machine from this repo's source, see the [instructions](./help/CreateImageAndAzureResources.md).
 
 For general questions about using the virtual environments or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/t5/GitHub-Actions/bd-p/actions).
 
@@ -43,4 +43,4 @@ we pin the tool to specific version(s).
 [Windows-2019]: https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
 [windows-2016]: https://github.com/actions/virtual-environments/blob/master/images/win/Windows2016-Readme.md
 [macOS-10.15]: https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md
-[self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners
\ No newline at end of file
+[self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners
diff --git a/images.CI/credscan-exclusions.json b/images.CI/credscan-exclusions.json
new file mode 100644
index 00000000..979dfa68
--- /dev/null
+++ b/images.CI/credscan-exclusions.json
@@ -0,0 +1,9 @@
+{
+    "tool": "Credential Scanner",
+    "suppressions": [
+    {
+        "placeholder": "P@ssword!!",
+        "_justification": "Password used by SQL Express. It is required to interact with database."
+    }
+  ]
+}
\ No newline at end of file
diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md
index 6195b68e..708681f3 100644
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,5 +1,5 @@
 # Ubuntu 16.04.6 LTS
-The following software is installed on machines with the 20200323.1 update.
+The following software is installed on machines with the 20200330.1 update.
 ***
 - 7-Zip 9.20
 - Ansible (ansible 2.9.6)
@@ -34,16 +34,20 @@ The following software is installed on machines with the 20200323.1 update.
   - wget
   - zip
   - zstd
-- AWS CLI (aws-cli/1.18.26 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.26)
+- AWS CLI (aws-cli/1.18.31 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.31)
 - build-essential
-- Clang 6.0 (6.0.1)
-- Clang 8 (8.0.1)
+- Clang 6.0 (6.0.0)
+- Clang 8 (8.0.0)
 - Clang 9 (9.0.1)
+- Swift version 5.2 (swift-5.2-RELEASE)
+Target: x86_64-unknown-linux-gnu
 - CMake (cmake version 3.16.2)
 - Docker Compose (docker-compose version 1.25.4, build 8d51620a)
 - Docker-Moby (Docker version 3.0.11+azure, build eb310fca49568dccd87c6136f774ef6fff2a1b51)
 - .NET Core SDK:
+  - 3.1.201
   - 3.1.200
+  - 3.1.103
   - 3.1.101
   - 3.1.100
   - 3.0.103
@@ -71,12 +75,14 @@ The following software is installed on machines with the 20200323.1 update.
   - 2.2.102
   - 2.2.101
   - 2.2.100
+  - 2.1.805
   - 2.1.804
   - 2.1.803
   - 2.1.802
   - 2.1.801
   - 2.1.701
   - 2.1.700
+  - 2.1.610
   - 2.1.609
   - 2.1.608
   - 2.1.607
@@ -85,6 +91,7 @@ The following software is installed on machines with the 20200323.1 update.
   - 2.1.604
   - 2.1.603
   - 2.1.602
+  - 2.1.513
   - 2.1.512
   - 2.1.511
   - 2.1.510
@@ -111,12 +118,12 @@ The following software is installed on machines with the 20200323.1 update.
 - GNU C++ 9.2.1
 - GNU Fortran 8.3.0
 - GNU Fortran 9.2.1
-- Git (2.25.2)
+- Git (2.26.0)
 - Git Large File Storage (LFS) (2.10.0)
 - Hub CLI (2.14.2)
 - Google Chrome (Google Chrome 80.0.3987.149 )
 - ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
-- Google Cloud SDK (285.0.1)
+- Google Cloud SDK (286.0.0)
 - Haskell Cabal (cabal-install version 2.0.0.1
 compiled using version 2.0.1.1 of the Cabal library )
 - Haskell Cabal (cabal-install version 2.2.0.0
@@ -137,7 +144,7 @@ compiled using version 3.0.2.0 of the Cabal library )
 - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
 - Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
 - Heroku (heroku/7.39.1 linux-x64 node-v12.13.0)
-- HHVM (HipHop VM 4.49.0 (rel))
+- HHVM (HipHop VM 4.50.0 (rel))
 - ImageMagick
 - Azul Zulu OpenJDK:
   - 7 (openjdk version "1.7.0_252")
@@ -145,10 +152,10 @@ compiled using version 3.0.2.0 of the Cabal library )
   - 11 (openjdk version "11.0.6" 2020-01-14 LTS)
   - 12 (openjdk version "12.0.2" 2019-07-16)
 - Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018)
-- Gradle 6.2.2
+- Gradle 6.3
 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
 - Kind (kind v0.7.0 go1.13.6 linux/amd64)
-- kubectl (Client Version: v1.17.4)
+- kubectl (error: Missing or incomplete configuration info.  Please point to an existing, complete config file:)
 - helm (v3.1.2+gd878d4d)
 - Leiningen (Leiningen 2.9.3 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
 - Mercurial (Mercurial Distributed SCM (version 4.4.1))
@@ -164,7 +171,7 @@ Local version: Unknown)
 - n (6.4.0)
 - Parcel (1.12.4)
 - TypeScript (Version 3.8.3)
-- Webpack (4.42.0)
+- Webpack (4.42.1)
 - Webpack CLI (3.3.11)
 - Yarn (1.22.4)
 - Bazel (bazel 2.2.0)
@@ -179,7 +186,7 @@ Local version: Unknown)
 - Composer  (Composer version 1.10.1 2020-03-13 20:34:27)
 - PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
 - Pollinate
-- psql (PostgreSQL) 9.5.19
+- psql (PostgreSQL) 9.5.21
 - Powershell (PowerShell 7.0.0)
 - ruby (2.3.1p112)
 - gem (3.1.2)
@@ -197,9 +204,9 @@ Local version: Unknown)
 - Sphinx Open Source Search Server
 - Subversion (svn, version 1.9.3 (r1718519))
 - Terraform (Terraform v0.12.24)
-- Packer (1.5.4)
+- Packer (1.5.5)
 - Vcpkg 2020.02.04-unknownhash
-- Zeit Now CLI (17.0.4)
+- Zeit Now CLI (17.1.1)
 - Go 1.11 (go version go1.11.13 linux/amd64)
 - Go 1.12 (go version go1.12.17 linux/amd64)
 - Go 1.13 (go version go1.13.9 linux/amd64)
@@ -272,13 +279,13 @@ Local version: Unknown)
 - Az Module (3.1.0)
 - Az Module (3.5.0)
 - Cached container images
+  - node:10-alpine (Digest: sha256:9a88e3bc3f845b74d2fd8adcbc64608736a8be4a3e9dc7aa34fa743e3677a552)
+  - node:12-alpine (Digest: sha256:6b5b783c9cfe229af0bd5b0b677dd32005bb22d58465f3d0fe7fbd1c60ce068c)
   - node:10 (Digest: sha256:df200903ff34c07c1b9112b4fd9d1342c11eb7d99525f2b366c487f91dda8131)
   - node:12 (Digest: sha256:facc1cbde6e5aa3255092b1a1417451953c80bd31ab5a4403f8bcd90b90a8407)
   - buildpack-deps:stretch (Digest: sha256:dc901bbf4b34e4ca8771c0d0773e557221452f97bcf0c732de7ecda3782bdf97)
   - debian:9 (Digest: sha256:ddb131307ad9c70ebf8c7962ba73c20101f68c7a511915aea3ad3b7ad47b9d20)
   - debian:8 (Digest: sha256:2c9b2323299846c5298c12db373da310f8114f2941ae3f496e95270cc8ca5ebd)
-  - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c)
-  - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5)
   - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14)
   - alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178)
   - alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f)
diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index 73e7ddc3..1adbc740 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,5 +1,5 @@
 # Ubuntu 18.04.4 LTS
-The following software is installed on machines with the 20200323.1 update.
+The following software is installed on machines with the 20200330.1 update.
 ***
 - 7-Zip 16.02
 - Ansible (ansible 2.9.6)
@@ -32,16 +32,20 @@ The following software is installed on machines with the 20200323.1 update.
   - wget
   - zip
   - zstd
-- AWS CLI (aws-cli/1.18.26 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.26)
+- AWS CLI (aws-cli/1.18.31 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.31)
 - build-essential
-- Clang 6.0 (6.0.1)
-- Clang 8 (8.0.1)
+- Clang 6.0 (6.0.0)
+- Clang 8 (8.0.0)
 - Clang 9 (9.0.0)
+- Swift version 5.2 (swift-5.2-RELEASE)
+Target: x86_64-unknown-linux-gnu
 - CMake (cmake version 3.16.2)
 - Docker Compose (docker-compose version 1.25.4, build 8d51620a)
 - Docker-Moby (Docker version 3.0.11+azure, build eb310fca49568dccd87c6136f774ef6fff2a1b51)
 - .NET Core SDK:
+  - 3.1.201
   - 3.1.200
+  - 3.1.103
   - 3.1.101
   - 3.1.100
   - 3.0.103
@@ -69,12 +73,14 @@ The following software is installed on machines with the 20200323.1 update.
   - 2.2.102
   - 2.2.101
   - 2.2.100
+  - 2.1.805
   - 2.1.804
   - 2.1.803
   - 2.1.802
   - 2.1.801
   - 2.1.701
   - 2.1.700
+  - 2.1.610
   - 2.1.609
   - 2.1.608
   - 2.1.607
@@ -83,6 +89,7 @@ The following software is installed on machines with the 20200323.1 update.
   - 2.1.604
   - 2.1.603
   - 2.1.602
+  - 2.1.513
   - 2.1.512
   - 2.1.511
   - 2.1.510
@@ -109,12 +116,12 @@ The following software is installed on machines with the 20200323.1 update.
 - GNU C++ 9.2.1
 - GNU Fortran 8.3.0
 - GNU Fortran 9.2.1
-- Git (2.25.2)
+- Git (2.26.0)
 - Git Large File Storage (LFS) (2.10.0)
 - Hub CLI (2.14.2)
 - Google Chrome (Google Chrome 80.0.3987.149 )
 - ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
-- Google Cloud SDK (285.0.1)
+- Google Cloud SDK (286.0.0)
 - Haskell Cabal (cabal-install version 2.0.0.1
 compiled using version 2.0.1.1 of the Cabal library )
 - Haskell Cabal (cabal-install version 2.2.0.0
@@ -135,7 +142,7 @@ compiled using version 3.0.2.0 of the Cabal library )
 - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
 - Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
 - Heroku (heroku/7.39.1 linux-x64 node-v12.13.0)
-- HHVM (HipHop VM 4.49.0 (rel))
+- HHVM (HipHop VM 4.50.0 (rel))
 - ImageMagick
 - Azul Zulu OpenJDK:
   - 7 (openjdk version "1.7.0_252")
@@ -143,10 +150,10 @@ compiled using version 3.0.2.0 of the Cabal library )
   - 11 (openjdk version "11.0.6" 2020-01-14 LTS)
   - 12 (openjdk version "12.0.2" 2019-07-16)
 - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019)
-- Gradle 6.2.2
+- Gradle 6.3
 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
 - Kind (kind v0.7.0 go1.13.6 linux/amd64)
-- kubectl (Client Version: v1.17.4)
+- kubectl (error: Missing or incomplete configuration info.  Please point to an existing, complete config file:)
 - helm (v3.1.2+gd878d4d)
 - Leiningen (Leiningen 2.9.3 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
 - Mercurial (Mercurial Distributed SCM (version 4.5.3))
@@ -162,7 +169,7 @@ Local version: Unknown)
 - n (6.4.0)
 - Parcel (1.12.4)
 - TypeScript (Version 3.8.3)
-- Webpack (4.42.0)
+- Webpack (4.42.1)
 - Webpack CLI (3.3.11)
 - Yarn (1.22.4)
 - Bazel (bazel 2.2.0)
@@ -193,9 +200,9 @@ Local version: Unknown)
 - Sphinx Open Source Search Server
 - Subversion (svn, version 1.9.7 (r1800392))
 - Terraform (Terraform v0.12.24)
-- Packer (1.5.4)
+- Packer (1.5.5)
 - Vcpkg 2020.02.04-unknownhash
-- Zeit Now CLI (17.0.4)
+- Zeit Now CLI (17.1.1)
 - Go 1.11 (go version go1.11.13 linux/amd64)
 - Go 1.12 (go version go1.12.17 linux/amd64)
 - Go 1.13 (go version go1.13.9 linux/amd64)
@@ -262,13 +269,13 @@ Local version: Unknown)
 - Az Module (3.1.0)
 - Az Module (3.5.0)
 - Cached container images
+  - node:10-alpine (Digest: sha256:9a88e3bc3f845b74d2fd8adcbc64608736a8be4a3e9dc7aa34fa743e3677a552)
+  - node:12-alpine (Digest: sha256:6b5b783c9cfe229af0bd5b0b677dd32005bb22d58465f3d0fe7fbd1c60ce068c)
   - node:10 (Digest: sha256:df200903ff34c07c1b9112b4fd9d1342c11eb7d99525f2b366c487f91dda8131)
   - node:12 (Digest: sha256:facc1cbde6e5aa3255092b1a1417451953c80bd31ab5a4403f8bcd90b90a8407)
   - buildpack-deps:stretch (Digest: sha256:dc901bbf4b34e4ca8771c0d0773e557221452f97bcf0c732de7ecda3782bdf97)
   - debian:9 (Digest: sha256:ddb131307ad9c70ebf8c7962ba73c20101f68c7a511915aea3ad3b7ad47b9d20)
   - debian:8 (Digest: sha256:2c9b2323299846c5298c12db373da310f8114f2941ae3f496e95270cc8ca5ebd)
-  - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c)
-  - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5)
   - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14)
   - alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178)
   - alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f)
diff --git a/images/linux/scripts/helpers/os.sh b/images/linux/scripts/helpers/os.sh
new file mode 100644
index 00000000..fa2d4cf4
--- /dev/null
+++ b/images/linux/scripts/helpers/os.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+################################################################################
+##  File:  install-helpers.sh
+##  Desc:  Helper functions for installing tools
+################################################################################
+
+function isUbuntu16
+{
+    lsb_release -d|grep 'Ubuntu 16' > /dev/null
+}
+
+function isUbuntu18
+{
+    lsb_release -d|grep 'Ubuntu 18' > /dev/null
+}
+
+function getOSVersionLabel
+{
+    isUbuntu16 && echo xenial || echo bionic
+}
\ No newline at end of file
diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh
index c98f43c5..e6e28afd 100644
--- a/images/linux/scripts/installers/firefox.sh
+++ b/images/linux/scripts/installers/firefox.sh
@@ -17,6 +17,10 @@ if ! command -v firefox; then
     exit 1
 fi
 
+# add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local.
+# Default firefox local is en_GB
+echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js"
+
 # Document what was added to the image
 echo "Lastly, documenting what we added to the metadata file"
 # Resolves: Running Firefox as root in a regular user's session is not supported.
@@ -25,8 +29,8 @@ HOME=/root
 DocumentInstalledItem "Firefox ($(firefox --version))"
 
 # Download and unpack latest release of geckodriver
-URL=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest|grep 'browser_download_url.*linux64.tar.gz'|sed -E 's/^.*(https:.+)".*/\1/g')
-echo "Downloading geckodriver $URL..."
+URL=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(contains("linux64.tar.gz"))')
+echo "Downloading geckodriver $URL"
 wget "$URL" -O geckodriver.tar.gz
 tar -xzf geckodriver.tar.gz
 rm geckodriver.tar.gz
diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh
index db051aae..1e36069a 100644
--- a/images/linux/scripts/installers/haskell.sh
+++ b/images/linux/scripts/installers/haskell.sh
@@ -30,7 +30,8 @@ apt-get install -y \
     cabal-install-2.0 \
     cabal-install-2.2 \
     cabal-install-2.4 \
-    cabal-install-3.0
+    cabal-install-3.0 \
+    cabal-install-3.2
 
 # Install haskell stack, pinned to v2.1.3
 curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/scripts/get-stack.sh | sh
@@ -45,7 +46,7 @@ for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.
     fi
 done
 # Check all cabal versions
-for version in 2.0 2.2 2.4 3.0; do
+for version in 2.0 2.2 2.4 3.0 3.2; do
     if ! command -v /opt/cabal/$version/bin/cabal; then
         echo "cabal $version was not installed"
         exit 1
@@ -58,7 +59,7 @@ fi
 
 # Document what was added to the image
 echo "Lastly, documenting what we added to the metadata file"
-for version in 2.0 2.2 2.4 3.0; do
+for version in 2.0 2.2 2.4 3.0 3.2; do
     DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))"
 done
 for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do
diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh
new file mode 100644
index 00000000..545253e5
--- /dev/null
+++ b/images/linux/scripts/installers/mongodb.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+################################################################################
+##  File:  homebrew.sh
+##  Desc:  Installs Mongo DB
+################################################################################
+
+# Source the helpers
+source $HELPER_SCRIPTS/os.sh
+source $HELPER_SCRIPTS/document.sh
+
+#  Install Mongo DB
+wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add -
+version=$(getOSVersionLabel)
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu $version/mongodb-org/4.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.2.list
+sudo apt-get update
+sudo apt-get install -y mongodb-org
+
+# Validate the installation
+echo "Validate the installation"
+if ! command -v mongod; then
+    echo "mongodb was not installed"
+    exit 1
+fi
+
+# Document the installed version
+echo "Document the installed version"
+DocumentInstalledItem "MongoDB on Linux ($(mongod -v|grep -i version 2>&1))"
diff --git a/images/linux/scripts/installers/nvm.sh b/images/linux/scripts/installers/nvm.sh
new file mode 100644
index 00000000..cbfab1a8
--- /dev/null
+++ b/images/linux/scripts/installers/nvm.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+################################################################################
+##  File:  nvm.sh
+##  Desc:  Installs Nvm
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+export NVM_DIR="/etc/skel/.nvm"
+mkdir $NVM_DIR
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
+echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/skel/.bash_profile
+echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm' | tee -a /etc/skel/.bash_profile
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+if ! command -v nvm; then
+    echo "nvm was not installed"
+    exit 1
+fi
+
+DocumentInstalledItem "nvm ($(nvm --version))"
\ No newline at end of file
diff --git a/images/linux/scripts/installers/rndgenerator.sh b/images/linux/scripts/installers/rndgenerator.sh
new file mode 100644
index 00000000..c2575989
--- /dev/null
+++ b/images/linux/scripts/installers/rndgenerator.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+################################################################################
+##  File:  rndgenerator.sh
+##  Desc:  Install random number generator
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+# Install haveged
+apt-get -y install haveged
+
+# Run tests to determine that the software installed as expected
+echo "Testing to make sure that script performed as expected, and basic scenarios work"
+for cmd in haveged; do
+    if ! command -v $cmd; then
+        echo "$cmd was not installed or not found on PATH"
+        exit 1
+    fi
+done
+
+# Document what was added to the image
+echo "Lastly, documenting what we added to the metadata file"
+DocumentInstalledItem "Haveged $(dpkg-query --showformat='${Version}' --show haveged)"
\ No newline at end of file
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 78a0d804..95ddc8cd 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -143,6 +143,7 @@
                 "{{template_dir}}/scripts/installers/1604/basic.sh",
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",
+                "{{template_dir}}/scripts/installers/nvm.sh",
                 "{{template_dir}}/scripts/installers/clang.sh",
                 "{{template_dir}}/scripts/installers/swift.sh",
                 "{{template_dir}}/scripts/installers/cmake.sh",
@@ -187,7 +188,9 @@
                 "{{template_dir}}/scripts/installers/vcpkg.sh",
                 "{{template_dir}}/scripts/installers/zeit-now.sh",
                 "{{template_dir}}/scripts/installers/updatepath.sh",
-                "{{template_dir}}/scripts/installers/dpkg-config.sh"
+                "{{template_dir}}/scripts/installers/dpkg-config.sh",
+                "{{template_dir}}/scripts/installers/mongodb.sh",
+                "{{template_dir}}/scripts/installers/rndgenerator.sh"
 
             ],
             "environment_vars": [
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 70ab724a..89871ce0 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -171,6 +171,7 @@
                 "{{template_dir}}/scripts/installers/miniconda.sh",
                 "{{template_dir}}/scripts/installers/mono.sh",
                 "{{template_dir}}/scripts/installers/mysql.sh",
+                "{{template_dir}}/scripts/installers/nvm.sh",
                 "{{template_dir}}/scripts/installers/nodejs.sh",
                 "{{template_dir}}/scripts/installers/bazel.sh",
                 "{{template_dir}}/scripts/installers/phantomjs.sh",
@@ -190,7 +191,9 @@
                 "{{template_dir}}/scripts/installers/vcpkg.sh",
                 "{{template_dir}}/scripts/installers/zeit-now.sh",
                 "{{template_dir}}/scripts/installers/updatepath.sh",
-                "{{template_dir}}/scripts/installers/dpkg-config.sh"
+                "{{template_dir}}/scripts/installers/dpkg-config.sh",
+                "{{template_dir}}/scripts/installers/mongodb.sh",
+                "{{template_dir}}/scripts/installers/rndgenerator.sh"
             ],
             "environment_vars": [
                 "METADATA_FILE={{user `metadata_file`}}",
diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index ec7f0a4e..62a84931 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,10 +1,10 @@
-# macOS Catalina 10.15.3 (19D76)
-The following software is installed on machines with the 20200321.1 update.
+# macOS Catalina 10.15.4 (19E266)
+The following software is installed on machines with the 20200328.1 update.
 
 #### Xcode 11.3.1 set by default
 ## Operating System
 
-- OS X 10.15.3 (19D76) **Catalina**
+- OS X 10.15.4 (19E266) **Catalina**
 
 ## Installed Software
 ### Language and Runtime
@@ -22,13 +22,13 @@ The following software is installed on machines with the 20200321.1 update.
 - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0
 - Node.js v12.16.1
 - NVM 0.33.11
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.11.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.12.0
 - PowerShell 7.0.0
 - Python 2.7.17
 - Python 3.7.7
 - Ruby 2.6.5p114
-- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200
-- Go 1.14
+- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200 3.1.201
+- Go 1.14.1
 - PHP 7.4.4
 - julia 1.4.0
 
@@ -38,10 +38,10 @@ The following software is installed on machines with the 20200321.1 update.
 - Bundler version 2.1.4
 - Carthage 0.34.0
 - CocoaPods 1.9.1
-- Homebrew 2.2.10
+- Homebrew 2.2.11
 - NPM 6.13.4
 - Yarn 1.22.4
-- NuGet 5.4.0.6315
+- NuGet 5.5.0.6382
 - Pip 19.3.1 (python 2.7)
 - Pip 20.0.2 (python 3.7)
 - Miniconda 4.8.2
@@ -49,20 +49,20 @@ The following software is installed on machines with the 20200321.1 update.
 
 ### Project Management
 - Apache Maven 3.6.3
-- Gradle 6.2.2
+- Gradle 6.3
 
 ### Utilities
 - Curl 7.69.1
-- Git: 2.25.2
+- Git: 2.26.0
 - Git LFS: 2.10.0
 - Hub CLI: 2.14.2
 - GNU Wget 1.20.3
 - Subversion (SVN) 1.13.0
-- Packer 1.5.4
-- GNU parallel 20200222
+- Packer 1.5.5
+- GNU parallel 20200322
 - OpenSSL 1.0.2t  10 Sep 2019
 - jq 1.6
-- gpg (GnuPG) 2.2.19
+- gpg (GnuPG) 2.2.20
 - psql (PostgreSQL) 12.2
 - aria2 1.35.0
 - azcopy 10.3.4
@@ -75,16 +75,17 @@ The following software is installed on machines with the 20200321.1 update.
 - docker-compose 1.25.4
 
 ### Tools
-- Fastlane 2.143.0
-- Cmake 3.16.5
-- App Center CLI 2.3.4
+- Fastlane 2.144.0
+- Cmake 3.17.0
+- App Center CLI 2.3.5
 - Azure CLI 2.2.0
+- AWS CLI 2.0.5
 
 ### Browsers
 - Google Chrome 80.0.3987.149
 - ChromeDriver 80.0.3987.106
 - Microsoft Edge 80.0.361.69
-- MSEdgeDriver 80.0.361.66
+- MSEdgeDriver 80.0.361.69
 - Mozilla Firefox 74.0
 - geckodriver 0.26.0
 
@@ -108,25 +109,29 @@ The following software is installed on machines with the 20200321.1 update.
 
 ### Xamarin
 #### Visual Studio for Mac
-- 8.4.8.2
+- 8.5.0.3183
 
 #### Mono
+- 6.8.0.123
 - 6.6.0.166
 - 6.4.0.208
 
 #### Xamarin.iOS
+- 13.14.1.39
 - 13.10.0.21
 - 13.8.3.0
 - 13.6.0.12
 - 13.4.0.2
 
 #### Xamarin.Mac
+- 6.14.1.39
 - 6.10.0.21
 - 6.8.3.0
 - 6.6.0.12
 - 6.4.0.2
 
 #### Xamarin.Android
+- 10.2.0
 - 10.1.3
 - 10.0.6
 
@@ -134,15 +139,15 @@ The following software is installed on machines with the 20200321.1 update.
 - NUnit 3.6.1
 
 ### Xcode
-| Version          | Build   | Path                              |
-| ---------------- | ------- | --------------------------------- |
-| 11.4 (beta)      | 11N132i | /Applications/Xcode_11.4_beta.app |
-| 11.3.1 (default) | 11C505  | /Applications/Xcode_11.3.1.app    |
-| 11.3             | 11C29   | /Applications/Xcode_11.3.app      |
-| 11.2.1           | 11B500  | /Applications/Xcode_11.2.1.app    |
-| 11.2             | 11B52   | /Applications/Xcode_11.2.app      |
-| 11.1             | 11A1027 | /Applications/Xcode_11.1.app      |
-| 11.0             | 11A420a | /Applications/Xcode_11.app        |
+| Version          | Build   | Path                           |
+| ---------------- | ------- | ------------------------------ |
+| 11.4             | 11E146  | /Applications/Xcode_11.4.app   |
+| 11.3.1 (default) | 11C505  | /Applications/Xcode_11.3.1.app |
+| 11.3             | 11C29   | /Applications/Xcode_11.3.app   |
+| 11.2.1           | 11B500  | /Applications/Xcode_11.2.1.app |
+| 11.2             | 11B52   | /Applications/Xcode_11.2.app   |
+| 11.1             | 11A1027 | /Applications/Xcode_11.1.app   |
+| 11.0             | 11A420a | /Applications/Xcode_11.app     |
 
 #### Xcode Support Tools
 - Nomad CLI 3.1.2
@@ -178,20 +183,20 @@ The following software is installed on machines with the 20200321.1 update.
 | DriverKit 19.0          | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 |
 
 #### Installed Simulators
-| OS          | Xcode Version                    | Simulators                                                                                                                                                                                                               |
-| ----------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| iOS 13.0    | 11.0                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                          |
-| iOS 13.1    | 11.1                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                          |
-| iOS 13.2    | 11.2<br>11.2.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                          |
-| iOS 13.3    | 11.3<br>11.3.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation) |
-| iOS 13.4    | 11.4                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation) |
-| tvOS 13.0   | 11.0<br>11.1                     | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| tvOS 13.2   | 11.2<br>11.2.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| tvOS 13.3   | 11.3<br>11.3.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| tvOS 13.4   | 11.4                             | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| watchOS 6.0 | 11.0<br>11.1                     | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                 |
-| watchOS 6.1 | 11.2<br>11.2.1<br>11.3<br>11.3.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                 |
-| watchOS 6.2 | 11.4                             | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                 |
+| OS          | Xcode Version                    | Simulators                                                                                                                                                                                                                                                      |
+| ----------- | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| iOS 13.0    | 11.0                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                                                                 |
+| iOS 13.1    | 11.1                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                                                                 |
+| iOS 13.2    | 11.2<br>11.2.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                                                                 |
+| iOS 13.3    | 11.3<br>11.3.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (1st generation) |
+| iOS 13.4    | 11.4                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Air (3rd generation)                       |
+| tvOS 13.0   | 11.0<br>11.1                     | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| tvOS 13.2   | 11.2<br>11.2.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| tvOS 13.3   | 11.3<br>11.3.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| tvOS 13.4   | 11.4                             | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| watchOS 6.0 | 11.0<br>11.1                     | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                        |
+| watchOS 6.1 | 11.2<br>11.2.1<br>11.3<br>11.3.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                        |
+| watchOS 6.2 | 11.4                             | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                        |
 
 ### Android
 #### Android SDK Tools
@@ -249,7 +254,7 @@ The following software is installed on machines with the 20200321.1 update.
 | cmake            | 3.6.4111459  |
 | lldb             | 3.1.4508709  |
 | ndk-bundle       | 18.1.5063045 |
-| Android Emulator | 30.0.0       |
+| Android Emulator | 30.0.5       |
 
 #### Android Google APIs
 | Package Name                | Description             |
diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 92d984c2..f7753eb9 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -238,7 +238,8 @@
             "type": "powershell",
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
-            ]
+            ],
+            "execution_policy": "remotesigned"
         },
         {
             "type": "windows-restart",
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 28cb297a..1698c550 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -14,7 +14,7 @@
         "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}",
         "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
-        "vm_size": "Standard_DS4_v2",
+        "vm_size": "Standard_D4_v2",
         "run_scan_antivirus": "false",
 
         "root_folder": "C:",
@@ -219,7 +219,8 @@
             "type": "powershell",
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
-            ]
+            ],
+            "execution_policy": "remotesigned"
         },
         {
             "type": "windows-restart",
@@ -585,6 +586,12 @@
                 "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1"
+            ]
+        },
         {
             "type": "windows-restart",
             "restart_timeout": "10m"
diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
index 03c4b98f..a016e5fd 100644
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -169,35 +169,36 @@ function Start-DownloadWithRetry
         [Parameter(Mandatory)]
         [string] $Name,
         [string] $DownloadPath = "${env:Temp}",
-        [int] $retries = 20
-        )
-    $FilePath = Join-Path $DownloadPath $Name
-    #Default retry logic for the package.
-    while($retries -gt 0)
-        {
-            try
-            {
-                Write-Host "Downloading package from: $Url to path $FilePath ."
-                (New-Object System.Net.WebClient).DownloadFile($Url, $FilePath)
-                break
-            }
-            catch
-            {
-                Write-Host "There is an error during package downloading"
-                $_
-                $retries--
+        [int] $Retries = 20
+    )
 
-                if ($retries -eq 0)
-                {
-                    Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url"
-                    $_
-                    exit 1
-                }
-                Write-Host "Waiting 30 seconds before retrying. Retries left: $retries"
-                Start-Sleep -Seconds 30
-            }
+    $FilePath = Join-Path -Path $DownloadPath -ChildPath $Name
+    #Default retry logic for the package.
+    while ($retries -gt 0)
+    {
+        try
+        {
+            Write-Host "Downloading package from: $Url to path $FilePath ."
+            (New-Object System.Net.WebClient).DownloadFile($Url, $FilePath)
+            break
         }
-   return $FilePath
+        catch
+        {
+            Write-Host "There is an error during package downloading:`n $_"
+            $retries--
+
+            if ($retries -eq 0)
+            {
+                Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url"
+                exit 1
+            }
+
+            Write-Host "Waiting 30 seconds before retrying. Retries left: $retries"
+            Start-Sleep -Seconds 30
+        }
+    }
+
+    return $FilePath
 }
 
 
diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1
index 99688788..5fe03e9b 100644
--- a/images/win/scripts/Installers/Install-DotnetSDK.ps1
+++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1
@@ -100,16 +100,10 @@ function RunPostInstallationSteps()
 {
     Add-MachinePathItem "C:\Program Files\dotnet"
     # Run script at startup for all users
-    $cmdDotNetPath = @"
-@echo off
-SETX PATH "%USERPROFILE%\.dotnet\tools;%PATH%"
-"@
-
-    $cmdPath = "C:\Program Files\dotnet\userpath.bat"
-    $cmdDotNetPath | Out-File -Encoding ascii -FilePath $cmdPath
+    $cmdDotNet = 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -NoProfile -Command "[System.Environment]::SetEnvironmentVariable(''PATH'',"""$env:USERPROFILE\.dotnet\tools;$env:PATH""", ''USER'')"'
 
     # Update Run key to run a script at logon
-    Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdPath
+    Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdDotNet
 }
 
 InstallAllValidSdks
diff --git a/images/win/scripts/Installers/Install-RootCA.ps1 b/images/win/scripts/Installers/Install-RootCA.ps1
new file mode 100644
index 00000000..cd3a4642
--- /dev/null
+++ b/images/win/scripts/Installers/Install-RootCA.ps1
@@ -0,0 +1,22 @@
+# Serialized Certificate Store File
+$sstFile = "$env:TEMP\roots.sst"
+# Generate SST from Windows Update
+$result = certutil.exe -generateSSTFromWU $sstFile
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "[Error]: failed to generate $sstFile sst file`n$result"
+    exit $LASTEXITCODE
+}
+
+$result = certutil.exe -dump $sstFile
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "[Error]: failed to dump $sstFile sst file`n$result"
+    exit $LASTEXITCODE
+}
+
+try {
+    Import-Certificate -FilePath $sstFile -CertStoreLocation Cert:\LocalMachine\Root
+} catch {
+    Write-Host "[Error]: failed to import ROOT CA`n$_"
+    exit 1
+}
+
diff --git a/images/win/scripts/Installers/Validate-Cmake.ps1 b/images/win/scripts/Installers/Validate-Cmake.ps1
index 1d887d35..bacd0d2f 100644
--- a/images/win/scripts/Installers/Validate-Cmake.ps1
+++ b/images/win/scripts/Installers/Validate-Cmake.ps1
@@ -5,11 +5,11 @@
 
 if(Get-Command -Name 'cmake')
 {
-    Write-Host "Cmake $(cmake -version) on path"
+    Write-Host "CMake $(cmake -version) on path"
 }
 else
 {
-    Write-Host 'cmake not on path'
+    Write-Host 'CMake not on path'
     exit 1
 }
 
@@ -20,7 +20,7 @@ if( $( $(cmake -version) | Out-String) -match  'cmake version (?<version>.*).*'
 }
 
 # Adding description of the software to Markdown
-$SoftwareName = "Cmake"
+$SoftwareName = "CMake"
 
 $Description = @"
 _Version:_ $cmakeVersion<br/>
diff --git a/images/win/scripts/Installers/Validate-SQLExpress.ps1 b/images/win/scripts/Installers/Validate-SQLExpress.ps1
index 1b5a3578..2cb7f4f3 100644
--- a/images/win/scripts/Installers/Validate-SQLExpress.ps1
+++ b/images/win/scripts/Installers/Validate-SQLExpress.ps1
@@ -40,7 +40,7 @@ $instanceName = "$env:computername\$sqlInstance"
 $version = Test-SqlConnection -ServerName $instanceName -IntegratedSecurity "false" -UserName $sqlUser -Password $sqlPassword
 
 # Adding description of the software to Markdown
-$SoftwareName = "Git"
+$SoftwareName = "Microsoft SQL Express"
 $Description = @"
 _Version:_ $version<br/>
 _InstanceName:_ $sqlInstance<br/>
diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
index d9210571..6f7dd13e 100644
--- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
@@ -30,6 +30,9 @@ function Disable-UserAccessControl {
     Write-Host "User Access Control (UAC) has been disabled."
 }
 
+# Set TLS1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
+
 Import-Module -Name ImageHelpers -Force
 
 Write-Host "Setup PowerShellGet"
@@ -98,12 +101,15 @@ else {
 }
 
 # Run the installer
-[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
 Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
 
 # Turn off confirmation
 choco feature enable -n allowGlobalConfirmation
 
+# https://github.com/chocolatey/choco/issues/89
+# Remove some of the command aliases, like `cpack` #89
+Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force
+
 # Install webpi
 choco install webpicmd -y
 
diff --git a/images/win/scripts/Installers/Windows2016/Install-VS2017.ps1 b/images/win/scripts/Installers/Windows2016/Install-VS2017.ps1
index 72801bd6..9edcb14f 100644
--- a/images/win/scripts/Installers/Windows2016/Install-VS2017.ps1
+++ b/images/win/scripts/Installers/Windows2016/Install-VS2017.ps1
@@ -125,7 +125,9 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + `
                 '--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ' + `
                 '--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre '+ `
                 '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre ' + `
-                '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre '
+                '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre ' + `
+                '--add Microsoft.VisualStudio.Workload.Office ' + `
+                '--add Microsoft.VisualStudio.Workload.OfficeBuildTools '
 
 $Sku = 'Enterprise'
 $VSBootstrapperURL = 'https://aka.ms/vs/15/release/vs_enterprise.exe'
diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
index 46574d7c..4f05935c 100644
--- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
@@ -104,6 +104,10 @@ Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey
 # Turn off confirmation
 choco feature enable -n allowGlobalConfirmation
 
+# https://github.com/chocolatey/choco/issues/89
+# Remove some of the command aliases, like `cpack` #89
+Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force
+
 # Install webpi
 choco install webpicmd -y