diff --git a/habitat-vs-2022-x64/plan.ps1 b/habitat-vs-2022-x64/plan.ps1
index 665c9ced..94e6b2e1 100644
--- a/habitat-vs-2022-x64/plan.ps1
+++ b/habitat-vs-2022-x64/plan.ps1
@@ -7,28 +7,28 @@ $pkg_upstream_url="https://visualstudio.microsoft.com/downloads/#build-tools-for
 $pkg_license=@("Microsoft Software License")
 $pkg_maintainer="The Habitat Maintainers <humans@habitat.sh>"
 $pkg_source="https://aka.ms/vs/17/release/vs_BuildTools.exe"
-$pkg_shasum="d3ffaa4ec21a06d29b773e544c0c613df65b270ad30c036b623188a8b12dd745"
+$pkg_shasum="02f7788cb00c9e0aa87ce0c1e923f7b12921aa1f06d9f78261ee0e3e5c794332"
 $pkg_build_deps=@("core/7zip")
 
 $pkg_bin_dirs=@(
-    "Contents\VC\Tools\MSVC\14.40.33810\bin\HostX64\x64",
-    "Contents\VC\Redist\MSVC\14.40.33810\x86\Microsoft.VC142.CRT",
+    "Contents\VC\Tools\MSVC\14.41.34120\bin\HostX64\x64",
+    "Contents\VC\Redist\MSVC\14.40.33807\x64\Microsoft.VC143.CRT",
     "Contents\MSBuild\Current\Bin"
 )
 $pkg_lib_dirs=@(
-    "Contents\VC\Tools\MSVC\14.40.33810\atlmfc\lib\x86",
-    "Contents\VC\Tools\MSVC\14.40.33810\lib\x86"
+    "Contents\VC\Tools\MSVC\14.41.34120\atlmfc\lib\x64",
+    "Contents\VC\Tools\MSVC\14.41.34120\lib\x64"
 )
 $pkg_include_dirs=@(
-    "Contents\VC\Tools\MSVC\14.40.33810\atlmfc\include",
-    "Contents\VC\Tools\MSVC\14.40.33810\include"
+    "Contents\VC\Tools\MSVC\14.41.34120\atlmfc\include",
+    "Contents\VC\Tools\MSVC\14.41.34120\include"
 )
 
 function Invoke-SetupEnvironment {
     Set-RuntimeEnv "DisableRegistryUse" "true"
     Set-RuntimeEnv "UseEnv" "true"
-    Set-RuntimeEnv "VCToolsVersion" "14.40.33810"
-    Set-RuntimeEnv -IsPath "VCToolsInstallDir_160" "$pkg_prefix\Contents\VC\Redist\MSVC\14.29.30133"
+    Set-RuntimeEnv "VCToolsVersion" "14.41.34120"
+    Set-RuntimeEnv -IsPath "VCToolsInstallDir_160" "$pkg_prefix\Contents\VC\Redist\MSVC\14.41.34120"
 }
 
 function Invoke-Unpack {
@@ -53,7 +53,8 @@ function Invoke-Unpack {
         "Microsoft.VisualStudio.Component.SQL.SSDTBuildSku",
         "Microsoft.VisualStudio.Component.VC.ATLMFC",
         "Microsoft.VisualStudio.Component.NuGet.BuildTools",
-        "Microsoft.VisualStudio.Component.VC.CLI.Support"
+        "Microsoft.VisualStudio.Component.VC.CLI.Support",
+        "Microsoft.VisualStudio.Component.Windows11SDK.26100"
     )
     foreach ($component in $components) {
         $installArgs += " --add $component"
diff --git a/habitat-win-10-sdk-x86/plan.ps1 b/habitat-win-10-sdk-x64/plan.ps1
similarity index 53%
rename from habitat-win-10-sdk-x86/plan.ps1
rename to habitat-win-10-sdk-x64/plan.ps1
index 85f1fb7f..d707b644 100644
--- a/habitat-win-10-sdk-x86/plan.ps1
+++ b/habitat-win-10-sdk-x64/plan.ps1
@@ -1,27 +1,28 @@
-$pkg_name="windows-10-sdk-x86"
+$pkg_name="windows-10-sdk-x64"
 $pkg_origin="chef"
-$pkg_version="10.0.17763"
-$pkg_description="The Windows 10 SDK for Windows 10, version 1809 (servicing release 10.0.17763.132) provides the latest headers, libraries, metadata, and tools for building Windows 10 apps"
-$pkg_upstream_url="https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk"
+$pkg_version="10.0.26100.0"
+$pkg_description="The Windows App SDK provides a unified set of APIs and tools that are decoupled from the OS and released to developers via NuGet packages. These APIs and tools can be used in a consistent way by any desktop app on Windows 11 and downlevel to Windows 10, version 1809"
+$pkg_upstream_url="https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/"
 $pkg_license=@("Microsoft Software License")
 $pkg_maintainer="The Habitat Maintainers <humans@habitat.sh>"
-$pkg_source="https://download.microsoft.com/download/5/C/3/5C3770A3-12B4-4DB4-BAE7-99C624EB32AD/windowssdk/winsdksetup.exe"
-$pkg_shasum="bbd1c41f9ebf518e4482c5c85a0de9ad7a72b596112c392911ef6054cb5d70d7"
+$pkg_source="https://go.microsoft.com/fwlink/?linkid=2272610"
+$pkg_filename="winsdksetup.exe"
+$pkg_shasum="5535188A9AEEA1CEBCBF04DE3C2C37D76F10600A65867FF65F6153D507B60488"
 $pkg_build_deps=@("core/lessmsi")
 
 $pkg_bin_dirs=@(
-    "Windows Kits\10\bin\x86",
-    "Windows Kits\10\bin\10.0.17763.0\x86"
+    "Windows Kits\10\bin\x64",
+    "Windows Kits\10\bin\10.0.26100.0\x64"
 )
 $pkg_lib_dirs=@(
-    "Windows Kits\10\Lib\10.0.17763.0\um\x86",
-    "Windows Kits\10\Lib\10.0.17763.0\ucrt\x86"
+    "Windows Kits\10\Lib\10.0.26100.0\um\x64",
+    "Windows Kits\10\Lib\10.0.26100.0\ucrt\x64"
 )
 $pkg_include_dirs=@(
-    "Windows Kits\10\Include\10.0.17763.0\shared",
-    "Windows Kits\10\Include\10.0.17763.0\ucrt",
-    "Windows Kits\10\Include\10.0.17763.0\um",
-    "Windows Kits\10\Include\10.0.17763.0\winrt"
+    "Windows Kits\10\Include\10.0.26100.0\shared",
+    "Windows Kits\10\Include\10.0.26100.0\ucrt",
+    "Windows Kits\10\Include\10.0.26100.0\um",
+    "Windows Kits\10\Include\10.0.26100.0\winrt"
 )
 
 function Invoke-SetupEnvironment {
@@ -29,7 +30,7 @@ function Invoke-SetupEnvironment {
 }
 
 function Invoke-Unpack {
-    Start-Process "$HAB_CACHE_SRC_PATH/$pkg_filename" -Wait -ArgumentList "/features OptionId.DesktopCPPx86 /quiet /layout $HAB_CACHE_SRC_PATH/$pkg_dirname"
+    Start-Process "$HAB_CACHE_SRC_PATH/$pkg_filename" -Wait -ArgumentList "/features OptionId.DesktopCPPx64 /quiet /layout $HAB_CACHE_SRC_PATH/$pkg_dirname"
     Push-Location "$HAB_CACHE_SRC_PATH/$pkg_dirname"
     try {
         Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname/installers" -Include *.msi -Recurse | ForEach-Object {
diff --git a/habitat-win-11-sdk-x64/plan.ps1 b/habitat-win-11-sdk-x64/plan.ps1
deleted file mode 100644
index 85f1fb7f..00000000
--- a/habitat-win-11-sdk-x64/plan.ps1
+++ /dev/null
@@ -1,48 +0,0 @@
-$pkg_name="windows-10-sdk-x86"
-$pkg_origin="chef"
-$pkg_version="10.0.17763"
-$pkg_description="The Windows 10 SDK for Windows 10, version 1809 (servicing release 10.0.17763.132) provides the latest headers, libraries, metadata, and tools for building Windows 10 apps"
-$pkg_upstream_url="https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk"
-$pkg_license=@("Microsoft Software License")
-$pkg_maintainer="The Habitat Maintainers <humans@habitat.sh>"
-$pkg_source="https://download.microsoft.com/download/5/C/3/5C3770A3-12B4-4DB4-BAE7-99C624EB32AD/windowssdk/winsdksetup.exe"
-$pkg_shasum="bbd1c41f9ebf518e4482c5c85a0de9ad7a72b596112c392911ef6054cb5d70d7"
-$pkg_build_deps=@("core/lessmsi")
-
-$pkg_bin_dirs=@(
-    "Windows Kits\10\bin\x86",
-    "Windows Kits\10\bin\10.0.17763.0\x86"
-)
-$pkg_lib_dirs=@(
-    "Windows Kits\10\Lib\10.0.17763.0\um\x86",
-    "Windows Kits\10\Lib\10.0.17763.0\ucrt\x86"
-)
-$pkg_include_dirs=@(
-    "Windows Kits\10\Include\10.0.17763.0\shared",
-    "Windows Kits\10\Include\10.0.17763.0\ucrt",
-    "Windows Kits\10\Include\10.0.17763.0\um",
-    "Windows Kits\10\Include\10.0.17763.0\winrt"
-)
-
-function Invoke-SetupEnvironment {
-    Set-RuntimeEnv -IsPath "WindowsSdkDir_10" "$pkg_prefix\Windows Kits\10"
-}
-
-function Invoke-Unpack {
-    Start-Process "$HAB_CACHE_SRC_PATH/$pkg_filename" -Wait -ArgumentList "/features OptionId.DesktopCPPx86 /quiet /layout $HAB_CACHE_SRC_PATH/$pkg_dirname"
-    Push-Location "$HAB_CACHE_SRC_PATH/$pkg_dirname"
-    try {
-        Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname/installers" -Include *.msi -Recurse | ForEach-Object {
-            lessmsi x $_
-        }
-    } finally { Pop-Location }
-    Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname" -Include @("x64", "arm", "arm64") -Recurse | ForEach-Object {
-        Remove-Item $_ -Recurse -Force
-    }
-}
-
-function Invoke-Install {
-    Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname" -Include "Windows Kits" -Recurse | ForEach-Object {
-        Copy-Item $_ "$pkg_prefix" -Exclude "*.duplicate*" -Recurse -Force
-    }
-}