diff --git a/netci.groovy b/netci.groovy
index 28afe1d900851abec37cf9ae5dca0a1301f992d3..f8574f395035e4e2de1705b2fc6ee7a56a3045cf 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -194,6 +194,6 @@ commitPullList.each { isPr ->
 
   def triggerPhraseOnly = false
   def triggerPhraseExtra = "microbuild"
-  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-update3')
+  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15')
   addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
diff --git a/src/Tools/MicroBuild/Build.proj b/src/Tools/MicroBuild/Build.proj
index 06ccc34b2184f5bf7a5c59c5948ff4eb056bf02a..f919226e98d763332df7e267b88e98317989688b 100644
--- a/src/Tools/MicroBuild/Build.proj
+++ b/src/Tools/MicroBuild/Build.proj
@@ -16,6 +16,7 @@
     <BranchName Condition="'$(BranchName)' == ''">master</BranchName>
     <SignRoslynArgs>-test</SignRoslynArgs>
     <PublishAssetsArgs>-test</PublishAssetsArgs>
+    <CopyInsertionFileArgs>-test</CopyInsertionFileArgs>
   </PropertyGroup>
 
   <Target Name="Build">
@@ -40,6 +41,8 @@
     <Exec Command="powershell -noprofile -executionPolicy ByPass -file $(MSBuildThisFileDirectory)stop-compiler-server.ps1" />
 
     <Exec Command="powershell -noprofile -executionPolicy ByPass -file $(MSBuildThisFileDirectory)publish-assets.ps1 -binariesPath &quot;$(BinariesPath)&quot; -branchName $(BranchName) -apiKey $(RoslynMyGetApiKey) $(PublishAssetsArgs)" />
+
+    <Exec Command="powershell -noprofile -executionPolicy ByPass -file $(MSBuildThisFileDirectory)copy-insertion-items.ps1 -binariesPath &quot;$(BinariesPath)&quot; $(CopyInsertionFileArgs)" />
   </Target>
 
 </Project>
diff --git a/src/Tools/MicroBuild/copy-insertion-items.ps1 b/src/Tools/MicroBuild/copy-insertion-items.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a2aece964085fcdac93867a6ee7fa14a505cee43
--- /dev/null
+++ b/src/Tools/MicroBuild/copy-insertion-items.ps1
@@ -0,0 +1,52 @@
+Param(
+    [string]$binariesPath = $null,
+    [switch]$test
+)
+set-strictmode -version 2.0
+$ErrorActionPreference="Stop"
+
+try
+{
+    $items = @(
+        "ExpressionEvaluatorPackage.vsix",
+        "Microsoft.VisualStudio.LanguageServices.Telemetry.vsix",
+        "Microsoft.VisualStudio.VsInteractiveWindow.vsix",
+        "Roslyn.VisualStudio.InteractiveComponents.vsix",
+        "Roslyn.VisualStudio.Setup.Interactive.vsix",
+        "Roslyn.VisualStudio.Setup.Next.vsix",
+        "Roslyn.VisualStudio.Setup.vsix",
+        "Microsoft.CodeAnalysis.ExpressionEvaluator.json",
+        "Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.json",
+        "Microsoft.CodeAnalysis.VisualStudio.Setup.json",
+        "Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json",
+        "Microsoft.CodeAnalysis.VisualStudio.Telemetry.json",
+        "Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.json",
+        "Microsoft.CodeAnalysis.VisualStudioInteractiveWindow.json",
+        "Microsoft.CodeAnalysis.LanguageServices.vsman",
+        "Microsoft.CodeAnalysis.Compilers.json",
+        "Microsoft.CodeAnalysis.Compilers.vsix",
+        "Microsoft.CodeAnalysis.Compilers.vsman")
+    $destPath = join-path $binariesPath "Insertion"
+    foreach ($item in $items) 
+    {
+        $sourcePath = join-path $binariesPath $item
+
+        # Many of these files are only produced in the Official MicroBuild runs.  On test runs, which run locally,
+        # we need to guard agains this.
+        if ((-not (test-path $sourcePath)) -and $test)
+        {
+            write-host "Skip copying $sourcePath for test run"
+            continue;
+        }
+
+        write-host "Copying $sourcePath to $destPath"
+        copy $sourcePath $destPath
+    }
+
+    exit 0
+}
+catch [exception]
+{
+    write-host $_.Exception
+    exit -1
+}