diff --git a/windows/Dockerfile b/windows/Dockerfile
index 97ed904a0..c850c7d63 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -27,10 +27,9 @@ ENV GIT_VERSION "2.26.2"
 ENV GIT_SHA256 "2dfbb1c46547c70179442a92b8593d592292b8bce2fd02ac4e0051a8072dde8f"
 ENV SEVENZIP_VERSION "19.0.0"
 ENV SEVENZIP_SHA256 "0f5d4dbbe5e55b7aa31b91e5925ed901fdf46a367491d81381846f05ad54c45e"
-ENV VS2017BUILDTOOLS_VERSION "16.8.3.0"
-ENV VS2017BUILDTOOLS_SHA256 "ccfb9355f4f753315455542f966025f96de734292d3908c8c3717e9685b709f0"
-#ENV VS2017BUILDTOOLS_DOWNLOAD_URL "https://download.visualstudio.microsoft.com/download/pr/d0eac510-174b-4241-b73b-93dc7cc1fbf7/9822b4c851e14d9658babd1533f66f518c6169196e985fe5713b2774128832ae/vs_BuildTools.exe"
-ENV VS2017BUILDTOOLS_DOWNLOAD_URL "https://download.visualstudio.microsoft.com/download/pr/9b3476ff-6d0a-4ff8-956d-270147f21cd4/ccfb9355f4f753315455542f966025f96de734292d3908c8c3717e9685b709f0/vs_BuildTools.exe"
+ENV VSBUILDTOOLS_VERSION "17.4.33110.190"
+ENV VSBUILDTOOLS_SHA256 "FABDA7E422ADA90C229262A4447C08933EC5BF66A9F38129CD19490EEA2DD180"
+ENV VSBUILDTOOLS_DOWNLOAD_URL "https://download.visualstudio.microsoft.com/download/pr/2160190b-bb01-4670-9492-34da461fa0c9/fabda7e422ada90c229262a4447c08933ec5bf66a9f38129cd19490eea2dd180/vs_BuildTools.exe"
 ENV GO_VERSION "1.18.8"
 ENV GO_SHA256 "980788761e75ed33ffc4f2a7a3ff07cd90949bd023eb1a8d855ef0b5de9cbcba"
 ENV RUBY_VERSION "2.6.6-1"
@@ -67,7 +66,7 @@ LABEL target_arch=${TARGET_ARCH}
 LABEL windows_version=${WINDOWS_VERSION}
 LABEL git_version=${GIT_VERSION}
 LABEL sevenzip_version=${SEVENZIP_VERSION}
-LABEL vs2017buildtools_version=${VS2017BUILDTOOLS_VERSION}
+LABEL vsbuildtools_version=${VSBUILDTOOLS_VERSION}
 LABEL go_version=${GO_VERSION}
 LABEL ruby_version=${RUBY_VERSION}
 LABEL wix_version=${WIX_VERSION}
@@ -117,7 +116,7 @@ RUN git config --system core.symlinks false
 
 # Install VS2017
 COPY ./windows/install_vstudio.ps1 install_vstudio.ps1
-RUN powershell -Command .\install_vstudio.ps1 -Version $ENV:VS2017BUILDTOOLS_VERSION -Sha256 $ENV:VS2017BUILDTOOLS_SHA256 $ENV:VS2017BUILDTOOLS_DOWNLOAD_URL
+RUN powershell -Command .\install_vstudio.ps1 -Version $ENV:VSBUILDTOOLS_VERSION -Sha256 $ENV:VSBUILDTOOLS_SHA256 $ENV:VSBUILDTOOLS_DOWNLOAD_URL
 
 # If x64, install the WDK for driver development
 COPY ./windows/install_wdk.ps1 install_wdk.ps1
diff --git a/windows/install_dotnetcore.ps1 b/windows/install_dotnetcore.ps1
index 249c30afe..d0f91d52a 100644
--- a/windows/install_dotnetcore.ps1
+++ b/windows/install_dotnetcore.ps1
@@ -5,16 +5,16 @@ $ErrorActionPreference = 'Stop'
 # Script directory is $PSScriptRoot
 
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$Version = "6.0.100"
-$url = "https://download.visualstudio.microsoft.com/download/pr/0f71eaf1-ce85-480b-8e11-c3e2725b763a/9044bfd1c453e2215b6f9a0c224d20fe/dotnet-sdk-6.0.100-win-x64.exe"
+$Version = "7.0.100"
+$url = "https://download.visualstudio.microsoft.com/download/pr/5b9d1f0d-9c56-4bef-b950-c1b439489b27/b4aa387715207faa618a99e9b2dd4e35/dotnet-sdk-7.0.100-win-x64.exe"
 Write-Host -ForegroundColor Green "Installing dotnetcore from $($Url)"
 
 $out = "$($PSScriptRoot)\dotnetcoresdk.exe"
-$sha256 = "1fcf6b9efd37d25e75b426cd8430eb3c006092bee07d748967f1dbfc3f9a0190"
+$sha512 = "32dceb94ca6b2445ec39802d7bb962e2d389801609ffb6706925539380fcb9c9ed75b932daae734ea8d5189d34c956494f50648d3dc3e292392607360bb47f35"
 
 Write-Host -ForegroundColor Green Downloading $Url to $out
 (New-Object System.Net.WebClient).DownloadFile($Url, $out)
-if ((Get-FileHash -Algorithm SHA256 $out).Hash -ne "$sha256") { Write-Host \"Wrong hashsum for ${out}: got '$((Get-FileHash -Algorithm SHA256 $out).Hash)', expected '$sha256'.\"; exit 1 }
+if ((Get-FileHash -Algorithm SHA512 $out).Hash -ne "$sha512") { Write-Host \"Wrong hashsum for ${out}: got '$((Get-FileHash -Algorithm SHA512 $out).Hash)', expected '$sha512'.\"; exit 1 }
 
 # Skip extraction of XML docs - generally not useful within an image/container - helps performance
 setx NUGET_XMLDOC_MODE skip
diff --git a/windows/install_vstudio.ps1 b/windows/install_vstudio.ps1
index 7521cdca3..c6f093ea0 100644
--- a/windows/install_vstudio.ps1
+++ b/windows/install_vstudio.ps1
@@ -44,7 +44,7 @@ $VSPackages = @(
     "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81",
 #    "Microsoft.VisualStudio.Component.Windows10SDK.17763",
     "Microsoft.VisualStudio.Component.Windows10SDK.18362"
-#    "Microsoft.VisualStudio.Component.Windows10SDK.19041"
+    "Microsoft.VisualStudio.Component.Windows10SDK.19041"
 )
 
 $VSPackageListParam = $VSPackages -join " --add "