diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b2a4a7132..768037280 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -98,22 +98,22 @@
       <Sha>5a41781eb69eb4721e736a99262dbd32b6bb55d4</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23203.7">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23204.25">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
+      <Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23203.7">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23204.25">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
+      <Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23203.7">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23204.25">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
+      <Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23203.7">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23204.25">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
+      <Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.4-servicing.23117.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 324ebcd81..5fd9ee1c2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,9 +69,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23203.7</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.300-preview.23203.7</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23203.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23204.25</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.300-preview.23204.25</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23204.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
index 7bf88fdd6..ae06ba154 100644
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
@@ -376,6 +376,9 @@
           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)' != ''" />