diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 2443ffa526760..2646a43d73f5e 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -70,13 +70,11 @@ jobs:
           pip install doc-warden==$(DocWardenVersion)
           ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
         displayName: "Verify Readmes"
-      - task: DownloadPipelineArtifact@2
-        displayName: "Download Build Artifacts"
-        condition: succeededOrFailed()
+      - task: UseDotNet@2
+        displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
         inputs:
-          artifact: packages
-          path: $(Pipeline.Workspace)/packages
-          patterns: "*.nupkg"
+          packageType: runtime
+          version: "$(DotNetCoreRuntimeVersion)"
       - template: /eng/common/pipelines/templates/steps/verify-path-length.yml
         parameters:
           SourceDirectory: $(Build.SourcesDirectory)
@@ -136,6 +134,11 @@ jobs:
       vmImage: "$(OSVmImage)"
     steps:
       - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
+      - task: UseDotNet@2
+        displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
+        inputs:
+          packageType: runtime
+          version: "$(DotNetCoreRuntimeVersion)"
       - script: >-
           dotnet test eng/service.proj --filter TestCategory!=Live --framework $(TestTargetFramework) --logger "trx;LogFileName=$(TestTargetFramework).trx" --logger:"console;verbosity=normal"
           /p:ServiceDirectory=${{parameters.ServiceToBuild}} /p:IncludeSrc=false /p:IncludeSamples=false /p:Configuration=$(BuildConfiguration) $(ConvertToProjectReferenceOption) /p:CollectCoverage=$(CollectCoverage)
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
index 9f89d5723406e..78101cc724d81 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
@@ -55,6 +55,12 @@ jobs:
 
         - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
 
+        - task: UseDotNet@2
+          displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
+          inputs:
+            packageType: runtime
+            version: "$(DotNetCoreRuntimeVersion)"
+
         - template: /eng/common/TestResources/deploy-test-resources.yml
           parameters:
             Location: ${{ parameters.Location }}
diff --git a/eng/pipelines/templates/steps/archetype-sdk-docs.yml b/eng/pipelines/templates/steps/archetype-sdk-docs.yml
index 71e121fe1030a..b6b3e7cc990fa 100644
--- a/eng/pipelines/templates/steps/archetype-sdk-docs.yml
+++ b/eng/pipelines/templates/steps/archetype-sdk-docs.yml
@@ -1,8 +1,4 @@
 steps:
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
-    inputs:
-      version: $(DotNetCoreSDKVersion)
   - pwsh: |
       # Download and Extract or restore Packages required for Doc Generation
       Write-Host "Download and Extract mdoc to Build.BinariesDirectory/mdoc"