diff --git a/CODEOWNERS b/CODEOWNERS
index 22fd91a945cb..1272a3799109 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,6 +2,7 @@
 # See https://help.github.com/articles/about-code-owners/
 
 /.devcontainer/ @dotnet/source-build-internal
+/eng/SourceBuild* @dotnet/source-build-internal
 /src/snaps/ @rbhanda
 /src/SourceBuild/ @dotnet/source-build-internal
 /src/VirtualMonoRepo/ @dotnet/product-construction
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 5f49a568806b..87224ebefacc 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -1,3 +1,5 @@
+<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
+
 <Project>
 
   <PropertyGroup>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 3c67bed75c41..ee09742d35f2 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,3 +1,6 @@
+<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
+<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
+
 <UsageData>
   <IgnorePatterns>
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
@@ -5,19 +8,8 @@
     <!--
       Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
       see: https://github.com/NuGet/Home/issues/11059
-
-      Once that's fixed, NuGet package version should be updated to newest, and intermediate product dependency
-      added to Version.Details.xml
     -->
-    <UsagePattern IdentityGlob="NuGet.Common/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Configuration/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Frameworks/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Packaging/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Versioning/*5.8.0*" />
-
-    <!-- Referenced by NuGet.Packaging.5.8.0 - could be resolved when version of NuGet packages gets updated. -->
-    <UsagePattern IdentityGlob="System.Security.Cryptography.Cng/5.0.0-preview.3.20214.6" />
-    <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0-preview.3.20214.6" />
+    <UsagePattern IdentityGlob="NuGet.*/*" />
 
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 5c8342aa5914..d189498d9ae3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -120,7 +120,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
-    <NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
   <PropertyGroup>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index b368b83ecddc..8e4875fa8218 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -43,6 +43,8 @@
 
     <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
 
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
+
     <!-- CS9057 - Caused by incoherency of analyzer assemblies during pre-release builds. -->
     <RepoNoWarns>CS9057</RepoNoWarns>
   </PropertyGroup>
diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj
index 5ad1f11af317..b90bc55a96b0 100644
--- a/src/core-sdk-tasks/core-sdk-tasks.csproj
+++ b/src/core-sdk-tasks/core-sdk-tasks.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.Build" Version="15.7.179" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
-    <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" />
+    <PackageReference Include="NuGet.Versioning" Version="$(NuGetBuildTasksPackageVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetBuildTasksPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />