diff --git a/eng/pipelines/doc-index.yml b/eng/pipelines/doc-index.yml
index fc9b7439b..5cb453e6c 100644
--- a/eng/pipelines/doc-index.yml
+++ b/eng/pipelines/doc-index.yml
@@ -1,10 +1,3 @@
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: azure/azure-sdk-tools
-      endpoint: azure
-
 jobs:
   - job: GenerateDocIndex
     pool:
@@ -15,7 +8,7 @@ jobs:
         inputs:
           versionSpec: '3.6'
 
-      - template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools
+      - template: /eng/common/pipelines/templates/steps/replace-relative-links.yml
         parameters:
           TargetFolder: '.'
           RootFolder: '.'
@@ -40,7 +33,7 @@ jobs:
         inputs:
           versionSpec: '3.6'
 
-      - template: eng/pipelines/templates/scripts/mashup-doc-index.yml@azure-sdk-tools
+      - template: /eng/common/pipelines/templates/steps/mashup-doc-index.yml
         parameters:
           SourceDirectory: $(Build.SourcesDirectory)
 
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 34ed1b4e6..9e1f75922 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -1,7 +1,13 @@
 parameters:
-  Artifacts: []
-  ServiceDirectory: not-specified
-  CtestRegex: .*
+- name: Artifacts
+  type: object
+  default: []
+- name: ServiceDirectory
+  type: string
+  default: not-specified
+- name: CtestRegex
+  type: string
+  default: .*
 
 
 stages:
diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml
index bac7ee57d..54b426b56 100644
--- a/sdk/core/ci.yml
+++ b/sdk/core/ci.yml
@@ -1,10 +1,3 @@
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-
 trigger:
   branches:
     include:
@@ -36,4 +29,4 @@ stages:
       CtestRegex: azure-core
       Artifacts:
         - Name: azure-core
-          Path: azure-core
+          Path: azure-core
\ No newline at end of file
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 763f89860..e0510110e 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -1,10 +1,3 @@
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-
 trigger:
   branches:
     include:
@@ -37,4 +30,4 @@ stages:
       CtestRegex: azure-core
       Artifacts:
         - Name: azure-storage
-          Path: .
+          Path: .
\ No newline at end of file