diff --git a/build.ps1 b/build.ps1
index 9c98727d..e510a5cd 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1271,7 +1271,22 @@ function Install-HostToolchain() {
 }
 
 function Build-Installer() {
-  Build-WiXProject toolchain.wixproj -Arch $HostArch -Properties @{
+  Build-WiXProject bld.wixproj -Arch $HostArch -Properties @{
+    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+    TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+  }
+
+  Build-WiXProject cli.wixproj -Arch $HostArch -Properties @{
+    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+    TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+  }
+
+  Build-WiXProject dbg.wixproj -Arch $HostArch -Properties @{
+    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+    TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+  }
+
+  Build-WiXProject ide.wixproj -Arch $HostArch -Properties @{
     DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
     TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
   }
@@ -1288,10 +1303,6 @@ function Build-Installer() {
     }
   }
 
-  Build-WiXProject devtools.wixproj -Arch $HostArch -Properties @{
-    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
-  }
-
   Build-WiXProject installer.wixproj -Arch $HostArch -Bundle -Properties @{
     OutputPath = "$($HostArch.BinaryRoot)\";
     MSI_LOCATION = "$($HostArch.BinaryRoot)\msi\";