diff --git a/rust.Dockerfile b/rust.Dockerfile
index 7e312d8..17402c2 100644
--- a/rust.Dockerfile
+++ b/rust.Dockerfile
@@ -5,6 +5,7 @@ ADD https://win.rustup.rs C:\docker\rustup-init.exe
 
 RUN C:\docker\rustup-init.exe --quiet -y
 RUN setx path "%path%;C:\Users\ContainerAdministrator\.cargo\bin"
+RUN C:\msvc\VC\Auxiliary\Build\vcvarsall.bat x64
 
 VOLUME C:\source\
 WORKDIR C:\source\
diff --git a/vs15.config b/vs15.config
index 592a02b..97f1f61 100644
--- a/vs15.config
+++ b/vs15.config
@@ -2,6 +2,9 @@
   "version": "1.0",
   "components": [
     "Microsoft.VisualStudio.Workload.VCTools",
-    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP"
+    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP",
+    "Microsoft.VisualStudio.Component.VC.ATL",
+    "Microsoft.VisualStudio.Component.VC.CMake.Project",
+    "Microsoft.VisualStudio.Component.Windows10SDK.17763"
   ]
 }
diff --git a/vs16.config b/vs16.config
index cba4d3d..b6facac 100644
--- a/vs16.config
+++ b/vs16.config
@@ -1,6 +1,15 @@
 {
   "version": "1.0",
   "components": [
-    "Microsoft.VisualStudio.Workload.VCTools"
+    "Microsoft.VisualStudio.Workload.VCTools",
+    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang",
+    "Microsoft.Component.VC.Runtime.UCRTSDK",
+    "Microsoft.VisualStudio.Component.VC.ASAN",
+    "Microsoft.VisualStudio.Component.VC.ATL",
+    "Microsoft.VisualStudio.Component.VC.CMake.Project",
+    "Microsoft.VisualStudio.Component.VC.Llvm.Clang",
+    "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.Component.Windows10SDK.18362",
   ]
 }