diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh
index f01633b436cb..e61ce1b25831 100755
--- a/src/SourceBuild/content/build.sh
+++ b/src/SourceBuild/content/build.sh
@@ -37,8 +37,7 @@ while :; do
     lowerI="$(echo $1 | awk '{print tolower($0)}')"
     case $lowerI in
         --clean-while-building)
-            # TODO: Reenable with https://github.com/dotnet/source-build/issues/3233
-            # MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true")
+            MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true")
             ;;
         --online)
             MSBUILD_ARGUMENTS+=( "-p:BuildWithOnlineSources=true")
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 770293dea32f..6bc3d017d93f 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -271,6 +271,9 @@
           DependsOnTargets="BuildRepoReferences"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(RepoCompletedSemaphorePath)Build.complete">
+
+    <Exec Command="$(DOTNET_HOST_PATH) 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)' != ''" />