diff --git a/repos/Directory.Build.targets.orig b/repos/Directory.Build.targets
index 9a61647b4d5..115cd213641 100644
--- a/repos/Directory.Build.targets.orig
+++ b/repos/Directory.Build.targets
@@ -376,6 +376,7 @@
           DependsOnTargets="BuildRepoReferences"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(RepoCompletedSemaphorePath)Build.complete">
+    <Exec Command="$(DotnetToolCommand) build-server shutdown" />
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building $(ProjectBuildReason)" />
     <Message Importance="High" Text="Running command:" />
     <Message Importance="High" Text="  $(BuildCommand) $(RepoApiArgs)" Condition="'$(BuildCommand)' != ''" />