diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index ea7fbb5e2aedf..daf910f199a7e 100644
--- a/images/win/Windows2016-Readme.md
+++ b/images/win/Windows2016-Readme.md
@@ -1,7 +1,7 @@
 <!--- DO NOT EDIT - This markdown file is autogenerated. -->
 # Windows Server 2016
 
-The following software is installed on machines with the 20200517.1 update.
+The following software is installed on machines with the 20200531.1 update.
 
 Components marked with **\*** have been upgraded since the previous version of the image.
 
@@ -20,7 +20,7 @@ _Environment:_
 
 ## Docker-compose
 
-_Version:_ 1.25.4<br/>
+_Version:_ 1.25.5<br/>
 _Environment:_
 * PATH: contains location of docker-compose.exe
 
@@ -37,8 +37,8 @@ _Version:_ 7.0.1
<br/>
 ## Docker images
 
 The following container images have been cached:
-* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:f94f291d29e62d8569633b332d7e7697c7d9801475175d77a40676750452a0c4)
-* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:e430d0477c99e480bd849ee22c0e3265c9c0ebcfc914cf90a05c47abedc3c82d)
+* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:fb0cfd6cbc29e8de8c187f027435250bd6bcbcf324ba7621a51335c6166281ac)
+* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:5c1a4e2842302a099ab23740fb5d524c605339420febd830ae831f37cc74d635)
 * mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:6611aae4ad3de2eb6db8f9893dad4aa04282ec47e68a6e7161325e1de2cfe5eb)
 * microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
 * mcr.microsoft.com/windows/nanoserver:10.0.14393.953 (Digest: sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268)
@@ -178,7 +178,7 @@ _Version:_ 1.1.1809.18001<br/>
 
 ## AWS CLI
 
-_Version:_ aws-cli 2.0.14<br/>
+_Version:_ aws-cli 2.0.17<br/>
 
 ## Android SDK Build Tools
 
@@ -190,6 +190,10 @@ _Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.3
 
 _Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.2
 
+#### 29.0.1
+
+_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.1
+
 #### 29.0.0
 
 _Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.0
@@ -433,13 +437,13 @@ _Description:_ .NET has been configured to use TLS 1.2 by default
 
 ## Azure CLI
 
-_Version:_ 2.5.1
+_Version:_ 2.5.1 *
 _Environment:_
 * PATH: contains location of az.cmd
 
 ## AWS SAM CLI
 
-_Version:_ 0.49.0<br/>
+_Version:_ 0.52.0<br/>
 
 ## Azure DevOps Cli extension
 
@@ -447,6 +451,8 @@ _Version:_ azure-devops                      0.18.0
 
 ## MSYS2
 
+> _Note:_ MSYS2 is pre-installed on image but not added to PATH.
+
 _Tool versions_
 _pacman:_ 5.2.1<br/>
 _bash:_ 4.4.23<br/>
@@ -454,10 +460,6 @@ _gcc:_ 10.1.0<br/>
 _tar:_ 1.32<br/>
 MSYS2 location: C:\msys64
 
-## PyPy
-
-_Version:_ 2.7.13 (x86)<br/>_Version:_ 3.6.9 (x86)<br/>
-
 ## Ruby
 
 _Version:_ 2.4.10 (x64)<br/>_Version:_ 2.5.8 (x64)<br/>_Version:_ 2.6.6 (x64)<br/>_Version:_ 2.7.1 (x64)<br/><br/>__System default version:__ Ruby 2.5.8p224<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Ruby\2.5.8\x64\bin<br/>* PATH: contains the location of Ruby 2.5.8p224<br/>* Gem Version: 3.1.3<br/>
@@ -470,9 +472,13 @@ _Version:_ 2.7.18<br/>_Version:_ 3.5.4<br/>_Version:_ 3.6.8<br/>_Version:_ 3.7.7
 
 _Version:_ 2.7.18<br/>_Version:_ 3.5.4<br/>_Version:_ 3.6.8<br/>_Version:_ 3.7.7<br/>_Version:_ 3.8.3<br/>
 
+## PyPy (x86)
+
+_Version:_ 2.7.13 [PyPy 7.3.1 with MSC v.1912 32 bit]<br/>_Version:_ 3.6.9 [PyPy 7.3.1 with MSC v.1912 32 bit]<br/>
+
 ## node (x64)
 
-_Version:_ 8.17.0<br/>_Version:_ 10.20.1<br/>_Version:_ 12.16.3<br/>_Version:_ 14.2.0<br/>
+_Version:_ 8.17.0<br/>_Version:_ 10.20.1<br/>_Version:_ 12.17.0<br/>_Version:_ 14.3.0<br/>
 
 ## OpenSSL
 
@@ -501,6 +507,10 @@ _Version:_ 2.14.2<br/>
 _Environment:_
 * PATH: contains location of hub.exe
 
+## GitHub CLI
+
+_Version:_ 0.9.0-pre<br/>
+
 ## Go (x64)
 
 
@@ -544,11 +554,11 @@ _Environment:_
 
 ## PHP (x64)
 
-#### 7.4.5
+#### 7.4.6
 
 _Environment:_
-* PATH: contains the location of php.exe version 7.4.5
-* PHPROOT: root directory of the PHP 7.4.5 installation
+* PATH: contains the location of php.exe version 7.4.6
+* PHPROOT: root directory of the PHP 7.4.6 installation
 
 ## Rust (64-bit)
 
@@ -559,7 +569,7 @@ _Environment:_
 
 ## Julia (x64)
 
-_Version:_ 1.4.1<br/>
+_Version:_ 1.4.2<br/>
 
 ## sbt
 
@@ -574,12 +584,12 @@ _Environment:_
 ## Google Chrome
 
 _version:_
-81.0.4044.138
+83.0.4103.61
 
 ## Microsoft Edge
 
 _version:_
-81.0.416.72
+83.0.478.37
 
 ## Mozilla Firefox
 
@@ -592,7 +602,7 @@ _version:_
 #### Chrome Driver
 
 _version:_
-81.0.4044.138
+83.0.4103.39
 
 _Environment:_
 * ChromeWebDriver: location of chromedriver.exe
@@ -608,7 +618,7 @@ _Environment:_
 #### IE Driver
 
 _version:_
-3.8.0.0
+3.150.1.0
 
 _Environment:_
 * IEWebDriver: location of IEDriverServer.exe
@@ -616,7 +626,7 @@ _Environment:_
 #### Microsoft Edge Driver
 
 _version:_
-81.0.416.72
+83.0.478.37
 
 _Environment:_
 * EdgeWebDriver: location of msedgedriver.exe
@@ -624,11 +634,11 @@ _Environment:_
 
 ## Node.js
 
-_Version:_ 12.16.3<br/>
+_Version:_ 12.17.0<br/>
 _Architecture:_ x64<br/>
 _Environment:_
 * PATH: contains location of node.exe<br/>
-* Gulp CLI version: 2.2.0 Local version: Unknown<br/>
+* Gulp CLI version: 2.2.1 Local version: Unknown<br/>
 * Grunt grunt-cli v1.3.2<br/>
 * Yarn 1.22.4<br/>
 
@@ -641,7 +651,7 @@ _Environment:_
 
 ## bazel
 
-_Version:_ bazel 3.1.0<br/>
+_Version:_ bazel 3.2.0<br/>
 
 ## bazelisk
 
@@ -694,7 +704,7 @@ _Environment:_
 
 ## CMake
 
-_Version:_ 3.17.2<br/>
+_Version:_ 3.17.3<br/>
 _Environment:_
 * PATH: contains location of cmake.exe
 
@@ -711,6 +721,7 @@ _Environment:_
 * PATH: contains location of dotnet.exe
 
 _SDK:_
+* 3.1.300 C:\Program Files\dotnet\sdk\3.1.300
 * 3.1.202 C:\Program Files\dotnet\sdk\3.1.202
 * 3.1.201 C:\Program Files\dotnet\sdk\3.1.201
 * 3.1.200 C:\Program Files\dotnet\sdk\3.1.200
@@ -833,21 +844,21 @@ _Version:_ 1.0
 
 _Version:_ 21.1.18221
 
-## MinGW
+## Mingw-w64
 
 _Version:_ 8.1.0<br/>
 _Environment:_
-* PATH: contains location of the MinGW 'bin' directory
+* PATH: contains location of the Mingw-w64 'bin' directory
 
 ## TypeScript
 
-_Version:_ Version 3.9.2<br/>
+_Version:_ Version 3.9.3<br/>
 
 ## ghc
 
 _Version:_
-ghc 8.10.1  
- ghc 8.6.5  (default) 
+ghc 8.10.1  (default) 
+ ghc 8.6.5  
  ghc 8.8.3  
 <br/>
 
@@ -869,7 +880,7 @@ _Environment:_
 
 ## Azure CosmosDb Emulator
 
-_Version:_ 2.9.2.0<br/>
+_Version:_ 2.11.0.0<br/>
 _Location:_ C:\Program Files\Azure Cosmos DB Emulator\
 
 ## 7zip
@@ -894,11 +905,11 @@ _Version:_ 1.4.0<br/>
 
 ## Inno Setup
 
-_Version:_ 6.0.4<br/>
+_Version:_ 6.0.5<br/>
 
 ## GitVersion
 
-_Version:_ 5.3.3.0<br/>
+_Version:_ 5.3.5.0<br/>
 
 ## Nullsoft Install System (NSIS)
 
@@ -915,14 +926,25 @@ _Environment:_
 * PATH: contains location of the vcpkg directory
 * VCPKG_INSTALLATION_ROOT: root directory of the vcpkg installation
 
+## VSWhere
+
+_Version_: 2.8.4+ff0de50053 - shim 0.8.1<br/>
+* PATH: contains location of vswhere.exe
+
 ## Kubectl
 
 _Version:_ Client Version: v1.18.2<br/>
 _Environment:_
 * PATH: contains location of kubectl.exe
 
+## minikube
+
+_Version:_ minikube version: v1.11.0<br/>
+_Environment:_
+* PATH: contains location of minikube.exe
+
 ## Kind
 
-_Version:_ kind v0.7.0 go1.13.6 windows/amd64<br/>
+_Version:_ kind v0.8.1 go1.14.2 windows/amd64<br/>
 _Environment:_
 * PATH: contains location of kind.exe