diff --git a/eng/Versions.props b/eng/Versions.props
index c557b7ce5..d34cba19f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,7 +22,7 @@
     <VersionFeature21>30</VersionFeature21>
     <VersionFeature31>32</VersionFeature31>
     <VersionFeature50>17</VersionFeature50>
-    <VersionFeature60>14</VersionFeature60>
+    <VersionFeature60>15</VersionFeature60>
     <VersionFeature70>2</VersionFeature70>
   </PropertyGroup>
   <!-- Restore feeds -->
diff --git a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
index d0a05029f..2692610eb 100644
--- a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
+++ b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
      <!-- 7.0.0 produced improperly versioned runtime assets because the OfficialBuildId
           was not set correctly.  This is the actual shipping version that it should have been -->
-     <NonshippingRuntimeVersionFor700>7.0.0-rtm.22518.5</NonshippingRuntimeVersionFor700>
+     <NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
 
      <MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
      <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
index ff1071e2e..80ff2e29e 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
@@ -14,13 +14,13 @@ internal class DotNetHelper
 {
     private static readonly object s_lockObj = new();
 
-    private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime();
     public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet");
     public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs");
     public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages");
     public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}");
 
     private ITestOutputHelper OutputHelper { get; }
+    private bool IsMonoRuntime { get; }
 
     public DotNetHelper(ITestOutputHelper outputHelper)
     {
@@ -38,6 +38,7 @@ internal class DotNetHelper
                 Directory.CreateDirectory(Config.DotNetDirectory);
                 ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper);
             }
+            IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
 
             if (!Directory.Exists(ProjectsDirectory))
             {
@@ -234,10 +235,8 @@ internal class DotNetHelper
         return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}";
     }
 
-    private static bool DetermineIsMonoRuntime()
+    private static bool DetermineIsMonoRuntime(string dotnetRoot)
     {
-        string dotnetRoot = Config.DotNetDirectory;
-
         string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App");
         if (!Directory.Exists(sharedFrameworkRoot))
         {