diff --git a/src/dotnet/Azure.ClientSdk.Analyzers/ci.yml b/src/dotnet/Azure.ClientSdk.Analyzers/ci.yml
index 3db1be1067a0..1a69de1d14d5 100644
--- a/src/dotnet/Azure.ClientSdk.Analyzers/ci.yml
+++ b/src/dotnet/Azure.ClientSdk.Analyzers/ci.yml
@@ -24,8 +24,4 @@ pr:
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
-    ToolDirectory: src/dotnet/Azure.ClientSdk.Analyzers
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
\ No newline at end of file
+    ToolDirectory: src/dotnet/Azure.ClientSdk.Analyzers
\ No newline at end of file
diff --git a/tools/CreateRuleFabricBot/ci.yml b/tools/CreateRuleFabricBot/ci.yml
index 3056843fa4cf..cfdb3f9dbeae 100644
--- a/tools/CreateRuleFabricBot/ci.yml
+++ b/tools/CreateRuleFabricBot/ci.yml
@@ -25,7 +25,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/CreateRuleFabricBot
-    # As of 12/10/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
diff --git a/tools/apiview/parsers/swagger-api-parser/ci.yml b/tools/apiview/parsers/swagger-api-parser/ci.yml
index 0e0948cd6bb1..e0fb7cf422ef 100644
--- a/tools/apiview/parsers/swagger-api-parser/ci.yml
+++ b/tools/apiview/parsers/swagger-api-parser/ci.yml
@@ -1,32 +1,28 @@
-# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
-trigger:
-  branches:
-    include:
-      - main
-      - feature/*
-      - release/*
-      - hotfix/*
-  paths:
-    include:
-      - tools/apiview/parsers/swagger-api-parser
-
-pr:
-  branches:
-    include:
-      - main
-      - feature/*
-      - release/*
-      - hotfix/*
-  paths:
-    include:
-      - tools/apiview/parsers/swagger-api-parser
-
-extends:
-  template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
-  parameters:
-    PackageDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
-    TestDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
+# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
+trigger:
+  branches:
+    include:
+      - main
+      - feature/*
+      - release/*
+      - hotfix/*
+  paths:
+    include:
+      - tools/apiview/parsers/swagger-api-parser
+
+pr:
+  branches:
+    include:
+      - main
+      - feature/*
+      - release/*
+      - hotfix/*
+  paths:
+    include:
+      - tools/apiview/parsers/swagger-api-parser
+
+extends:
+  template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
+  parameters:
+    PackageDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
+    TestDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest
diff --git a/tools/http-fault-injector/ci.yml b/tools/http-fault-injector/ci.yml
index 0f303c344a01..5e9ca989e80c 100644
--- a/tools/http-fault-injector/ci.yml
+++ b/tools/http-fault-injector/ci.yml
@@ -25,7 +25,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/http-fault-injector
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403    
diff --git a/tools/identity-resolution/ci.yml b/tools/identity-resolution/ci.yml
index 6800e9ce4b67..2f2ba1eeb231 100644
--- a/tools/identity-resolution/ci.yml
+++ b/tools/identity-resolution/ci.yml
@@ -25,7 +25,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/identity-resolution
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
diff --git a/tools/notification-configuration/ci.yml b/tools/notification-configuration/ci.yml
index 63e4917631a9..a7055e35ef1b 100644
--- a/tools/notification-configuration/ci.yml
+++ b/tools/notification-configuration/ci.yml
@@ -29,7 +29,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/notification-configuration
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
diff --git a/tools/pipeline-generator/ci.yml b/tools/pipeline-generator/ci.yml
index ea7e1425c944..65862d80c9df 100644
--- a/tools/pipeline-generator/ci.yml
+++ b/tools/pipeline-generator/ci.yml
@@ -25,7 +25,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/pipeline-generator
-    # As of 12/10/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
diff --git a/tools/snippet-generator/ci.yml b/tools/snippet-generator/ci.yml
index fa1d12b3e74c..92ea5cccd50d 100644
--- a/tools/snippet-generator/ci.yml
+++ b/tools/snippet-generator/ci.yml
@@ -25,7 +25,3 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/snippet-generator
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
diff --git a/tools/stress-cluster/cluster/kubernetes/generator/ci.yml b/tools/stress-cluster/cluster/kubernetes/generator/ci.yml
index 1bd32d104ab0..5b8a8f52c012 100644
--- a/tools/stress-cluster/cluster/kubernetes/generator/ci.yml
+++ b/tools/stress-cluster/cluster/kubernetes/generator/ci.yml
@@ -19,7 +19,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/stress-cluster/cluster/kubernetes/generator
-    # As of 12/11/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403
diff --git a/tools/version-guard/ci.yml b/tools/version-guard/ci.yml
index b1563d24b6cc..213880682103 100644
--- a/tools/version-guard/ci.yml
+++ b/tools/version-guard/ci.yml
@@ -25,7 +25,3 @@ extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
   parameters:
     ToolDirectory: tools/version-guard
-    # As of 12/10/2022 this is a temporary override until the globally-set
-    # SDK is set to net6.0. For details, please see:
-    # https://github.com/Azure/azure-sdk-tools/pull/4916
-    DotNetCoreVersion: 6.0.403