diff --git a/global.json b/global.json
index 3a464ec16615..6ae4d587b6d4 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.6.21313.2"
+    "version": "6.0.100-preview.7.21324.2"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.6.21313.2",
+    "dotnet": "6.0.100-preview.7.21324.2",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",
diff --git a/src/ProjectTemplates/Shared/Project.cs b/src/ProjectTemplates/Shared/Project.cs
index dfb6129f6aaf..37024ae9c0a7 100644
--- a/src/ProjectTemplates/Shared/Project.cs
+++ b/src/ProjectTemplates/Shared/Project.cs
@@ -109,8 +109,6 @@ internal async Task<ProcessResult> RunDotNetNewAsync(
                     Directory.Delete(TemplateOutputDir, recursive: true);
                 }
                 
-                // Temporary while investigating why this process occasionally never runs or exits on Debian 9
-                environmentVariables.Add("COREHOST_TRACE", "1");
                 using var execution = ProcessEx.Run(Output, AppContext.BaseDirectory, DotNetMuxer.MuxerPathOrDefault(), argString, environmentVariables);
                 await execution.Exited;
                 return new ProcessResult(execution);
diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
index 9a6c698ffb33..b50068b3e59e 100644
--- a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
+++ b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
@@ -128,8 +128,8 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output)
 
         private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName)
         {
-            var proc = await RunDotNetNew(output, $"");
-            if (!proc.Output.Contains($" {templateName} "))
+            var proc = await RunDotNetNew(output, $"--list");
+            if (!(proc.Output.Contains($" {templateName} ") || proc.Output.Contains($",{templateName}") || proc.Output.Contains($"{templateName},")))
             {
                 throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}.");
             }