diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a58b7ac8b3e..d7606a1825c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -157,25 +157,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24157.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24158.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2215d18d04a6565e9133c15ece7df7161fdf1e8e</Sha>
+      <Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24157.3">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24158.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2215d18d04a6565e9133c15ece7df7161fdf1e8e</Sha>
+      <Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24157.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24158.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2215d18d04a6565e9133c15ece7df7161fdf1e8e</Sha>
+      <Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24157.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24158.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2215d18d04a6565e9133c15ece7df7161fdf1e8e</Sha>
+      <Sha>e91ff1729192ebae270f0d42502da51eeb853741</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 87e46ec1c3a..6cf1c792466 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,7 +49,7 @@
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
     <MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24157.3</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24158.3</MicrosoftDotNetCodeAnalysisPackageVersion>
   </PropertyGroup>
   <!-- Sourcelink -->
   <PropertyGroup>
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 352607308fd..1df0201243b 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -15,6 +15,7 @@ parameters:
   timeoutInMinutes: ''
   variables: []
   workspace: ''
+  templateContext: ''
 
 # Job base template specific parameters
   # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -68,6 +69,9 @@ jobs:
   ${{ if ne(parameters.timeoutInMinutes, '') }}:
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 
+  ${{ if ne(parameters.templateContext, '') }}:
+    templateContext: ${{ parameters.templateContext }}
+
   variables:
   - ${{ if ne(parameters.enableTelemetry, 'false') }}:
     - name: DOTNET_CLI_TELEMETRY_PROFILE
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 01c0dd995e4..a3277bf15c5 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -15,6 +15,7 @@ parameters:
   timeoutInMinutes: ''
   variables: []
   workspace: ''
+  templateContext: ''
 
 # Job base template specific parameters
   # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -68,6 +69,9 @@ jobs:
   ${{ if ne(parameters.timeoutInMinutes, '') }}:
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 
+  ${{ if ne(parameters.templateContext, '') }}:
+    templateContext: ${{ parameters.templateContext }}
+
   variables:
   - ${{ if ne(parameters.enableTelemetry, 'false') }}:
     - name: DOTNET_CLI_TELEMETRY_PROFILE
diff --git a/global.json b/global.json
index 8fc268f8198..76c3b8227ac 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24157.3",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24157.3"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24158.3",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24158.3"
   },
   "sdk": {
     "version": "9.0.100-preview.1.24101.2"