diff --git a/vs16.config b/vs16.config
index fffc3c2..aa97a1a 100644
--- a/vs16.config
+++ b/vs16.config
@@ -2,8 +2,6 @@
   "version": "1.0",
   "components": [
     "Microsoft.VisualStudio.Workload.VCTools",
-    "Microsoft.VisualStudio.Component.NuGet",
-    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.Windows10SDK.18362"
+    "Microsoft.VisualStudio.Component.NuGet.BuildTools",
   ]
 }
diff --git a/winxp.Dockerfile b/winxp.Dockerfile
index e1cd015..243b1e8 100644
--- a/winxp.Dockerfile
+++ b/winxp.Dockerfile
@@ -13,4 +13,4 @@ RUN C:\docker\vs_buildtools.exe --quiet --wait --norestart --nocache `
 
 VOLUME C:\source\
 WORKDIR C:\source\
-CMD ["powershell", "-NoExit", "-Command", "Import-Module C:\\msvc\\Common7\\Tools\\Microsoft.VisualStudio.DevShell.dll;", "Enter-VsDevShell -Verbose -VsInstallPath C:\\msvc\\ -DevCmdArguments -arch=amd64"]
+CMD ["cmd", "/k C:\\msvc\\Common7\\Tools\\VsDevCmd.bat"]