diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ab4e343b3..1bf2fbfd2 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.22614.2",
+      "version": "1.1.0-beta.22615.1",
       "commands": [
         "darc"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 611186207..ec422244e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -205,13 +205,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>cb37e1f67041bfc6484ec47525bda461606efe92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22614.2">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22615.1">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>33a418a5d21c1fd1286d0b7bf2c737f89361edd1</Sha>
+      <Sha>77b07fcd4e3d68ee364d1d7f7a7b6debfa7546a8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22614.2">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22615.1">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>33a418a5d21c1fd1286d0b7bf2c737f89361edd1</Sha>
+      <Sha>77b07fcd4e3d68ee364d1d7f7a7b6debfa7546a8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 084ece458..4d13397bc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.22614.2</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.22615.1</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
index 1de78e8f8..dc550accf 100644
--- a/src/SourceBuild/tarball/content/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/Directory.Build.props
@@ -33,7 +33,8 @@
   <PropertyGroup>
     <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
     <TargetsDir>$(ProjectDir)targets/</TargetsDir>
-    <KeysDir>$(ProjectDir)prereqs/keys/</KeysDir>
+    <PrereqsDir>$(ProjectDir)prereqs/</PrereqsDir>
+    <KeysDir>$(PrereqsDir)/keys/</KeysDir>
     <DotNetCliToolDir Condition="'$(DotNetCliToolDir)' == '' and '$(CustomDotNetSdkDir)' != ''">$([MSBuild]::EnsureTrailingSlash('$(CustomDotNetSdkDir)'))</DotNetCliToolDir>
     <DotNetCliToolDir Condition="'$(DotNetCliToolDir)' == '' and '$(DOTNET_INSTALL_DIR)' != ''">$([MSBuild]::NormalizeDirectory('$(DOTNET_INSTALL_DIR)'))</DotNetCliToolDir>
     <DotNetCliToolDir Condition="'$(DotNetCliToolDir)' == ''">$(ProjectDir).dotnet/</DotNetCliToolDir>
@@ -120,14 +121,9 @@
     <RoslynDebugPathTargetDir>$(BaseOutputPath)roslyn-debug/</RoslynDebugPathTargetDir>
     <AspNetRazorBuildServerLogDir>$(BaseOutputPath)aspnet-debug</AspNetRazorBuildServerLogDir>
     <AspNetRazorBuildServerLogFile>$(AspNetRazorBuildServerLogDir)razor-build-server.log</AspNetRazorBuildServerLogFile>
-    <!-- Dir where git info is generated during online builds. -->
-    <GitInfoOutputDir>$(BaseOutputPath)git-info/</GitInfoOutputDir>
-    <!-- Dir where git info is placed inside the tarball. -->
-    <GitInfoOfflineDir>$(ProjectDir)git-info/</GitInfoOfflineDir>
-    <OutputGitInfoPropsFile>$(GitInfoOutputDir)$(RepositoryName).props</OutputGitInfoPropsFile>
-    <ProductionAllRepoPropsFile>$(GitInfoOutputDir)AllRepoVersions.props</ProductionAllRepoPropsFile>
-    <OfflineGitInfoPropsFile>$(GitInfoOfflineDir)$(RepositoryName).props</OfflineGitInfoPropsFile>
-    <OfflineAllRepoPropsFile>$(GitInfoOfflineDir)AllRepoVersions.props</OfflineAllRepoPropsFile>
+    <GitInfoDir>$(PrereqsDir)git-info/</GitInfoDir>
+    <GitInfoRepoPropsFile>$(GitInfoDir)$(RepositoryName).props</GitInfoRepoPropsFile>
+    <GitInfoAllRepoPropsFile>$(GitInfoDir)AllRepoVersions.props</GitInfoAllRepoPropsFile>
     <PackageReportDir>$(BaseOutputPath)prebuilt-report/</PackageReportDir>
     <RepoProjectsDir>$(ProjectDir)/repo-projects/</RepoProjectsDir>
     <ResultingPrebuiltPackagesDir>$(PackageReportDir)prebuilt-packages/</ResultingPrebuiltPackagesDir>
@@ -205,8 +201,7 @@
     <ExtraPackageVersionPropsPackageInfo Include="DotnetCliInternalVersion" Version="3.0.100-$(CliInternalReleaseTag)-$(CliInternalBuildVersion)" />
   </ItemGroup>
 
-  <Import Project="$(ProductionAllRepoPropsFile)" Condition="Exists('$(ProductionAllRepoPropsFile)')" />
-  <Import Project="$(OfflineAllRepoPropsFile)" Condition="Exists('$(OfflineAllRepoPropsFile)')" />
+  <Import Project="$(GitInfoAllRepoPropsFile)" />
 
   <!-- Additional psuedo-versions that some repos depend on -->
   <ItemGroup>
diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj
index cbad41cc9..c06ee0784 100644
--- a/src/SourceBuild/tarball/content/build.proj
+++ b/src/SourceBuild/tarball/content/build.proj
@@ -24,7 +24,6 @@
   <Target Name="PrepareOutput">
     <MakeDir Directories="$(OutputPath)" />
     <MakeDir Directories="$(LoggingDir)" />
-    <MakeDir Directories="$(GitInfoOutputDir)" />
     <MakeDir Directories="$(IntermediatePath)" />
     <MakeDir Directories="$(SourceBuiltBlobFeedDir)" />
     <MakeDir Directories="$(SourceBuiltPackagesPath)" />
diff --git a/src/SourceBuild/tarball/content/eng/tools/init-build.proj b/src/SourceBuild/tarball/content/eng/tools/init-build.proj
index b7b75a86f..1206c1b50 100644
--- a/src/SourceBuild/tarball/content/eng/tools/init-build.proj
+++ b/src/SourceBuild/tarball/content/eng/tools/init-build.proj
@@ -3,7 +3,7 @@
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
-  <Import Project="$(OfflineAllRepoPropsFile)" Condition="Exists('$(OfflineAllRepoPropsFile)')" />
+  <Import Project="$(GitInfoAllRepoPropsFile)" />
 
   <UsingTask AssemblyFile="$(LeakDetectionTasksAssembly)" TaskName="MarkAndCatalogPackages" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="NuGetPack" />
diff --git a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props b/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props
index 76fb89308..dc8d58db5 100644
--- a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props
@@ -6,8 +6,7 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
-  <Import Project="$(OutputGitInfoPropsFile)" Condition="Exists('$(OutputGitInfoPropsFile)')" />
-  <Import Project="$(OfflineGitInfoPropsFile)" Condition="Exists('$(OfflineGitInfoPropsFile)')" />
+  <Import Project="$(GitInfoRepoPropsFile)" Condition="Exists('$(GitInfoRepoPropsFile)')" />
 
   <PropertyGroup>
     <SourceDirectory Condition="'$(SourceDirectory)' == ''">$(RepositoryName)</SourceDirectory>