diff --git a/build/ci/.azure-devops-stages-docs.yml b/build/ci/.azure-devops-stages-docs.yml
index 4bdc895a49bc..4a5a998584a6 100644
--- a/build/ci/.azure-devops-stages-docs.yml
+++ b/build/ci/.azure-devops-stages-docs.yml
@@ -1,23 +1,9 @@
 
 stages:
-- stage: Setup
+- stage: setup
   displayName: Setup
   jobs:
-  - template: .azure-devops-commitsar.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-spell-check.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-markdown-lint.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-pipeline-validations.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
+  - template: .azure-devops-setup.yml
 
 - stage: docs_generation
   displayName: Docs Generation
diff --git a/build/ci/.azure-devops-stages.yml b/build/ci/.azure-devops-stages.yml
index eb405055b783..974bedc9793d 100644
--- a/build/ci/.azure-devops-stages.yml
+++ b/build/ci/.azure-devops-stages.yml
@@ -3,21 +3,7 @@ stages:
 - stage: setup
   displayName: Setup
   jobs:
-  - template: .azure-devops-commitsar.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-spell-check.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-markdown-lint.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-pipeline-validations.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
+  - template: .azure-devops-setup.yml
 
 - stage: convert_tree
   displayName: UWP Tree Conversion
diff --git a/build/ci/setup/.azure-devops-setup.yml b/build/ci/setup/.azure-devops-setup.yml
new file mode 100644
index 000000000000..329f28749156
--- /dev/null
+++ b/build/ci/setup/.azure-devops-setup.yml
@@ -0,0 +1,16 @@
+jobs:
+  - template: .azure-devops-commitsar.yml
+    parameters:
+      vmImage: '$(linuxVMImage)'
+
+  - template: .azure-devops-spell-check.yml
+    parameters:
+      vmImage: '$(linuxVMImage)'
+
+  - template: .azure-devops-markdown-lint.yml
+    parameters:
+      vmImage: '$(linuxVMImage)'
+
+  - template: .azure-devops-pipeline-validations.yml
+    parameters:
+      vmImage: '$(linuxVMImage)'