diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index 6f6ac6d8f..ea7fbb5e2 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 20200505.1 update.
+The following software is installed on machines with the 20200517.1 update.
 
 Components marked with **\*** have been upgraded since the previous version of the image.
 
@@ -26,26 +26,26 @@ _Environment:_
 
 ## Helm
 
-_Version:_ v3.2.0+ge11b7ce<br/>
+_Version:_ v3.2.1+gfe51cd1<br/>
 _Environment:_
 * PATH: contains location of helm
 
 ## Powershell Core
 
-_Version:_ 7.0.0
<br/>
+_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:4610dbc0e9f033247b336ebf62b2c690dc9e93de5c937b4660aad52847123086)
-* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:888f36a9fa4ccd409967426f1a731ab6112a8acc36459268471fccd0e67e5326)
-* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:f4c4f31c7ee654e73bd130b89e6ad5a659f5ede52fd9eb653c9db4aa12f6e0ea)
+* 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/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)
 
 ## Visual Studio 2017 Enterprise
 
-_Version:_ VisualStudio/15.9.22+28307.1093<br/>
+_Version:_ VisualStudio/15.9.23+28307.1146<br/>
 _Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise
 
 The following workloads including required and recommended components are installed with Visual Studio 2017:
@@ -178,7 +178,7 @@ _Version:_ 1.1.1809.18001<br/>
 
 ## AWS CLI
 
-_Version:_ aws-cli 2.0.10<br/>
+_Version:_ aws-cli 2.0.14<br/>
 
 ## Android SDK Build Tools
 
@@ -439,12 +439,21 @@ _Environment:_
 
 ## AWS SAM CLI
 
-_Version:_ 0.48.0<br/>
+_Version:_ 0.49.0<br/>
 
 ## Azure DevOps Cli extension
 
 _Version:_ azure-devops                      0.18.0
 
+## MSYS2
+
+_Tool versions_
+_pacman:_ 5.2.1<br/>
+_bash:_ 4.4.23<br/>
+_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/>
@@ -455,11 +464,15 @@ _Version:_ 2.4.10 (x64)<br/>_Version:_ 2.5.8 (x64)<br/>_Version:_ 2.6.6 (x64)<br
 
 ## Python (x64)
 
-_Version:_ 2.7.18<br/>_Version:_ 3.5.4<br/>_Version:_ 3.6.8<br/>_Version:_ 3.7.7<br/>_Version:_ 3.8.2<br/><br/>__System default version:__ Python 3.7.7<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Python\3.7.7\x64<br/>* PATH: contains the location of Python 3.7.7<br/>
+_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/><br/>__System default version:__ Python 3.7.7<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Python\3.7.7\x64<br/>* PATH: contains the location of Python 3.7.7<br/>
 
 ## Python (x86)
 
-_Version:_ 2.7.18<br/>_Version:_ 3.5.4<br/>_Version:_ 3.6.8<br/>_Version:_ 3.7.7<br/>_Version:_ 3.8.2<br/>
+_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/>
+
+## node (x64)
+
+_Version:_ 8.17.0<br/>_Version:_ 10.20.1<br/>_Version:_ 12.16.3<br/>_Version:_ 14.2.0<br/>
 
 ## OpenSSL
 
@@ -506,6 +519,10 @@ _Environment:_
 
 
 #### _Notes:_
+
+> `BOOST_ROOT` is not set on images but it is required by CMake. Please make sure you set this variable
+> value to either `BOOST_ROOT_1_69_0` or `BOOST_ROOT_1_72_0` depending on the Boost version you are using.
+
 Link: https://cmake.org/cmake/help/latest/module/FindBoost.html
 
 If Boost was built using the `boost-cmake` project or from `Boost 1.70.0` on it provides a package
@@ -519,11 +536,11 @@ Set `Boost_NO_BOOST_CMAKE to ON`, to disable the search for boost-cmake.
 
 ## Composer
 
-#### Composer version 1.10.5 2020-04-10 11:44:22
+#### Composer version 1.10.6 2020-05-06 10:28:10
 
 _Environment:_
-* PATH: contains the location of composer.exe version Composer version 1.10.5 2020-04-10 11:44:22
-* PHPROOT: root directory of the Composer Composer version 1.10.5 2020-04-10 11:44:22 installation
+* PATH: contains the location of composer.exe version Composer version 1.10.6 2020-05-06 10:28:10
+* PHPROOT: root directory of the Composer Composer version 1.10.6 2020-05-06 10:28:10 installation
 
 ## PHP (x64)
 
@@ -535,7 +552,7 @@ _Environment:_
 
 ## Rust (64-bit)
 
-#### 1.43.0
+#### 1.43.1
 _Environment:_
 * _Location:_ C:\Rust\.cargo\bin
 * PATH: contains the location of rustc.exe
@@ -557,17 +574,17 @@ _Environment:_
 ## Google Chrome
 
 _version:_
-81.0.4044.129
+81.0.4044.138
 
 ## Microsoft Edge
 
 _version:_
-81.0.416.68
+81.0.416.72
 
 ## Mozilla Firefox
 
 _version:_
-75.0
+76.0.1
 
 ## Selenium Web Drivers
 
@@ -575,7 +592,7 @@ _version:_
 #### Chrome Driver
 
 _version:_
-81.0.4044.69
+81.0.4044.138
 
 _Environment:_
 * ChromeWebDriver: location of chromedriver.exe
@@ -599,7 +616,7 @@ _Environment:_
 #### Microsoft Edge Driver
 
 _version:_
-81.0.416.68
+81.0.416.72
 
 _Environment:_
 * EdgeWebDriver: location of msedgedriver.exe
@@ -646,9 +663,9 @@ _Environment:_
 
 _Location:_ C:\Program Files\Java\zulu-7-azure-jdk_7.31.0.5-7.0.232-win_x64
 
-#### 13.0.3
+#### 11.0.4
 
-_Location:_ C:\Program Files\Java\zulu-13-azure-jdk_13.31.11-13.0.3-win_x64
+_Location:_ C:\Program Files\Java\zulu-11-azure-jdk_11.33.15-11.0.4-win_x64
 
 #### 13.0.3
 
@@ -683,7 +700,7 @@ _Environment:_
 
 ## SQL Server Data Tier Application Framework (x64)
 
-_Version:_ 15.0.4538.1<br/>
+_Version:_ 15.0.4769.1<br/>
 * SQL Server Express LocalDB is available at C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe
 
 ## .NET Core
@@ -694,8 +711,10 @@ _Environment:_
 * PATH: contains location of dotnet.exe
 
 _SDK:_
+* 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
+* 3.1.104 C:\Program Files\dotnet\sdk\3.1.104
 * 3.1.103 C:\Program Files\dotnet\sdk\3.1.103
 * 3.1.102 C:\Program Files\dotnet\sdk\3.1.102
 * 3.1.101 C:\Program Files\dotnet\sdk\3.1.101
@@ -721,6 +740,7 @@ _SDK:_
 * 2.2.102 C:\Program Files\dotnet\sdk\2.2.102
 * 2.2.101 C:\Program Files\dotnet\sdk\2.2.101
 * 2.2.100 C:\Program Files\dotnet\sdk\2.2.100
+* 2.1.806 C:\Program Files\dotnet\sdk\2.1.806
 * 2.1.805 C:\Program Files\dotnet\sdk\2.1.805
 * 2.1.804 C:\Program Files\dotnet\sdk\2.1.804
 * 2.1.803 C:\Program Files\dotnet\sdk\2.1.803
@@ -728,6 +748,7 @@ _SDK:_
 * 2.1.801 C:\Program Files\dotnet\sdk\2.1.801
 * 2.1.701 C:\Program Files\dotnet\sdk\2.1.701
 * 2.1.700 C:\Program Files\dotnet\sdk\2.1.700
+* 2.1.611 C:\Program Files\dotnet\sdk\2.1.611
 * 2.1.610 C:\Program Files\dotnet\sdk\2.1.610
 * 2.1.609 C:\Program Files\dotnet\sdk\2.1.609
 * 2.1.608 C:\Program Files\dotnet\sdk\2.1.608
@@ -737,6 +758,7 @@ _SDK:_
 * 2.1.604 C:\Program Files\dotnet\sdk\2.1.604
 * 2.1.603 C:\Program Files\dotnet\sdk\2.1.603
 * 2.1.602 C:\Program Files\dotnet\sdk\2.1.602
+* 2.1.514 C:\Program Files\dotnet\sdk\2.1.514
 * 2.1.513 C:\Program Files\dotnet\sdk\2.1.513
 * 2.1.512 C:\Program Files\dotnet\sdk\2.1.512
 * 2.1.511 C:\Program Files\dotnet\sdk\2.1.511
@@ -760,6 +782,7 @@ _SDK:_
 * 1.1.14 C:\Program Files\dotnet\sdk\1.1.14
 
 _Runtime:_
+* 3.1.4 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.4
 * 3.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.3
 * 3.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.2
 * 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1
@@ -781,6 +804,7 @@ _Runtime:_
 * 2.1.4 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.4
 * 2.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.3
 * 2.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.2
+* 2.1.18 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.18
 * 2.1.17 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.17
 * 2.1.16 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.16
 * 2.1.15 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.15
@@ -817,7 +841,25 @@ _Environment:_
 
 ## TypeScript
 
-_Version:_ Version 3.8.3<br/>
+_Version:_ Version 3.9.2<br/>
+
+## ghc
+
+_Version:_
+ghc 8.10.1  
+ ghc 8.6.5  (default) 
+ ghc 8.8.3  
+<br/>
+
+## cabal
+
+_Version:_ cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library <br/>
+
+## Stack
+
+_Version:_ Version 2.3.1, Git revision de2a7b694f07de7e6cf17f8c92338c16286b2878 (8103 commits) x86_64 hpack-0.33.0<br/>
+_Environment:_
+* PATH: contains location of stack.exe
 
 ## Miniconda
 
@@ -836,7 +878,7 @@ _Version:_ 19.00<br/>
 
 ## Packer
 
-_Version:_ 1.5.5<br/>
+_Version:_ 1.5.6<br/>
 
 ## Mercurial
 
@@ -856,7 +898,7 @@ _Version:_ 6.0.4<br/>
 
 ## GitVersion
 
-_Version:_ 5.3.2.0<br/>
+_Version:_ 5.3.3.0<br/>
 
 ## Nullsoft Install System (NSIS)