diff --git a/Directory.Build.props b/Directory.Build.props
index cbf29a7eaecf25..0b999b18d37dbe 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -24,6 +24,7 @@
     <RepositoryEngineeringDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng'))</RepositoryEngineeringDir>
     <ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>
     <ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
+    <ArtifactsObjDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'obj'))</ArtifactsObjDir>
   </PropertyGroup>
 
   <!-- The TFMs to build and test against. -->
@@ -34,6 +35,8 @@
     <NetFrameworkCurrent>net472</NetFrameworkCurrent>
   </PropertyGroup>
 
+  <Import Project="$(RepositoryEngineeringDir)Configurations.props" />
+
   <!--
     Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
     $(Subset) automatically when creating project-to-project dependencies.
@@ -52,14 +55,6 @@
     <CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
   </PropertyGroup>
 
-  <!-- Honor the generic RuntimeConfiguration property. -->
-  <PropertyGroup>
-    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
-    <!-- There's no checked configuration on Mono. -->
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
-  </PropertyGroup>
-
   <!-- Packaging properties -->
   <PropertyGroup>
     <!--
diff --git a/eng/Build.props b/eng/Build.props
index 5e060adde8d6b7..95f52b37593d49 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -15,6 +15,7 @@
       https://github.com/dotnet/arcade/issues/388
   -->
 
+  <Import Project="$(MSBuildThisFileDirectory)Configurations.props" />
   <Import Project="$(MSBuildThisFileDirectory)Subsets.props" />
 
   <Target Name="CheckSpecifiedSubsetValidity"
diff --git a/eng/Configurations.props b/eng/Configurations.props
new file mode 100644
index 00000000000000..e43c30b7d199c5
--- /dev/null
+++ b/eng/Configurations.props
@@ -0,0 +1,11 @@
+<Project>
+  <!-- Honor the generic RuntimeConfiguration property. -->
+  <PropertyGroup>
+    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(ConfigurationGroup)</RuntimeConfiguration>
+    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
+    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
+    <!-- There's no checked configuration on Mono. -->
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 3de5e378d190d7..a7a3072d7234fa 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -102,29 +102,21 @@
     <ProjectToBuild Include="$(RepoToolsLocalDir)regenerate-readme-table.proj" />
   </ItemGroup>
 
-  <!-- Honor the generic RuntimeConfiguration property. -->
-  <PropertyGroup>
-    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
-    <!-- There's no checked configuration on Mono. -->
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
-  </PropertyGroup>
-
   <ItemDefinitionGroup Condition="'$(CoreCLRConfiguration)' != ''">
     <CoreClrProjectToBuild>
-      <Properties>Configuration=$(CoreCLRConfiguration)</Properties>
+      <AdditionalProperties>Configuration=$(CoreCLRConfiguration)</AdditionalProperties>
     </CoreClrProjectToBuild>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(MonoConfiguration)' != ''">
     <MonoProjectToBuild>
-      <Properties>Configuration=$(MonoConfiguration)</Properties>
+      <AdditionalProperties>Configuration=$(MonoConfiguration)</AdditionalProperties>
     </MonoProjectToBuild>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(LibrariesConfiguration)' != ''">
     <LibrariesProjectToBuild>
-      <Properties>Configuration=$(LibrariesConfiguration)</Properties>
+      <AdditionalProperties>Configuration=$(LibrariesConfiguration)</AdditionalProperties>
     </LibrariesProjectToBuild>
   </ItemDefinitionGroup>
 
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index a63c17866df12d..4de97ca6e678b6 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <CoreCLROSGroup Condition="'$(CoreCLROSGroup)' == ''">$(OSGroup)</CoreCLROSGroup>
-    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(Configuration)</CoreCLRConfiguration>
     <MonoOSGroup Condition="'$(MonoOSGroup)' == ''">$(OSGroup)</MonoOSGroup>
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == ''">$(Configuration)</MonoConfiguration>
     <LibrariesOSGroup Condition="'$(LibrariesOSGroup)' == ''">$(OSGroup)</LibrariesOSGroup>
     <LibrariesConfiguration Condition="'$(LibrariesConfiguration)' == ''">$(Configuration)</LibrariesConfiguration>
 
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index 82dc4d0c6e6d67..a4b637d32128bb 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -1,5 +1,6 @@
 parameters:
   buildConfig: ''
+  runtimeConfig: ''
   archType: ''
   osGroup: ''
   osSubgroup: ''
@@ -11,8 +12,8 @@ parameters:
 jobs:
 - template: /eng/common/templates/job/job.yml
   parameters:
-    name: ${{ format('runtime_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-    displayName: ${{ format('Runtime Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+    name: ${{ format('build_{0}{1}_{2}_{3}_runtime{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.runtimeConfig) }}
+    displayName: ${{ format('Build {0}{1} {2} {3} Runtime {4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.runtimeConfig) }}
     dependsOn: checkout
     pool: ${{ parameters.pool }}
     container: ${{ parameters.container }}
@@ -35,5 +36,14 @@ jobs:
     - template: /eng/pipelines/common/clone-checkout-bundle-step.yml
 
     # Build
-    - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -c ${{ parameters.buildConfig }} -arch ${{ parameters.archType }}
+    - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -c ${{ parameters.buildConfig }} -runtimeConfiguration ${{ parameters.runtimeConfig }} -arch ${{ parameters.archType }} -ci
       displayName: Build product
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Logs
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/'
+        PublishLocation: Container
+        ArtifactName: $(Agent.Os)_PublishBuildAssets
+      continueOnError: true
+      condition: always()
diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml
index 57d5e3cadd2ef5..c066480ab8732b 100644
--- a/eng/pipelines/global-build.yml
+++ b/eng/pipelines/global-build.yml
@@ -46,6 +46,7 @@ jobs:
     - OSX_x64
     jobParameters:
       testGroup: innerloop
+      runtimeConfig: debug
 
 #
 # Build the combined runtime repo
@@ -58,3 +59,4 @@ jobs:
     - Linux_x64
     jobParameters:
       testGroup: innerloop
+      runtimeConfig: release
diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
index a668f9fe15485e..65cdaac224cba3 100644
--- a/src/coreclr/build.cmd
+++ b/src/coreclr/build.cmd
@@ -386,7 +386,8 @@ if %__RestoreOptData% EQU 1 (
     echo %__MsgPrefix%Restoring the OptimizationData Package
     powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" /clp:nosummary %__ArcadeScriptArgs%^
         %OptDataProjectFilePath% /t:Restore^
-        %__CommonMSBuildArgs% %__UnprocessedBuildArgs%
+        %__CommonMSBuildArgs% %__UnprocessedBuildArgs%^
+        /nodereuse:false
     if not !errorlevel! == 0 (
         echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to restore the optimization data package.
         set __exitCode=!errorlevel!
diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
index 6c54d81b115e3c..12ac5ee749acb8 100755
--- a/src/coreclr/build.sh
+++ b/src/coreclr/build.sh
@@ -53,7 +53,8 @@ restore_optdata()
         echo "Restoring the OptimizationData package"
         "$__RepoRootDir/eng/common/msbuild.sh" /clp:nosummary $__ArcadeScriptArgs \
                                                $OptDataProjectFilePath /t:Restore /m \
-                                               $__CommonMSBuildArgs $__UnprocessedBuildArgs
+                                               $__CommonMSBuildArgs $__UnprocessedBuildArgs \
+                                               /nodereuse:false
         local exit_code="$?"
         if [[ "$exit_code" != 0 ]]; then
             echo "${__ErrMsgPrefix}Failed to restore the optimization data package."
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index e883f37d60c239..45b0883faa4bef 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -1,9 +1,7 @@
 <Project InitialTargets="AddSkipGetTargetFrameworkToProjectReferences">
   <PropertyGroup>
     <CoreCLROSGroup Condition="'$(CoreCLROSGroup)' == ''">$(_bc_OSGroup)</CoreCLROSGroup>
-    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(_bc_ConfigurationGroup)</CoreCLRConfiguration>
     <MonoOSGroup Condition="'$(MonoCLROSGroup)' == ''">$(_bc_OSGroup)</MonoOSGroup>
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == ''">$(_bc_ConfigurationGroup)</MonoConfiguration>
   </PropertyGroup>
 
   <Import Project="..\..\Directory.Build.targets" />
diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props
index 0c099b282eeddc..a10c98bb4d94dc 100644
--- a/src/libraries/shims/manual/Directory.Build.props
+++ b/src/libraries/shims/manual/Directory.Build.props
@@ -14,9 +14,7 @@
     <!-- Use runtime assemblies for the TargetFramework, using build configuration OSGroup -->
     <RefPath>$(ArtifactsBinDir)runtime/$(TargetFramework)-$(_bc_OSGroup)-$(_bc_ConfigurationGroup)-$(ArchGroup)/</RefPath>
     <CoreCLROSGroup>$(_bc_OSGroup)</CoreCLROSGroup>
-    <CoreCLRConfiguration>$(_bc_ConfigurationGroup)</CoreCLRConfiguration>
     <MonoOSGroup>$(_bc_OSGroup)</MonoOSGroup>
-    <MonoConfiguration>$(_bc_ConfigurationGroup)</MonoConfiguration>
   </PropertyGroup>
 
   <ItemGroup>