diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
index 2c8d11b79b88..629bee369cff 100644
--- a/eng/pipelines/aggregate-reports.yml
+++ b/eng/pipelines/aggregate-reports.yml
@@ -1,10 +1,6 @@
 trigger: none
 pr: none
 
-variables:
-  Skip.MyPy: true
-  Skip.Pylint: true
-  Skip.ApiStubGen: true
 
 jobs:
 - job: 'ValidateDependencies'
@@ -19,7 +15,7 @@ jobs:
     parameters:
       Directory: ""
 
-  - template: ./templates/steps/analyze.yml
+  - template: /eng/pipelines/templates/steps/analyze_dependency.yml
 
   - task: AzureFileCopy@2
     displayName: 'Upload dependency report'
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index eae12578bda1..e518ef1efd9a 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -5,31 +5,7 @@ parameters:
   AdditionalTestArgs: ''
 
 steps:
-  - task: UsePythonVersion@0
-    displayName: 'Use Python $(PythonVersion)'
-    inputs:
-     versionSpec: '$(PythonVersion)'
-
-  - task: DownloadPipelineArtifact@0
-    inputs:
-      artifactName: 'artifacts'
-      targetPath: $(Build.ArtifactStagingDirectory)
-
-  - script: |
-     pip install -r eng/ci_tools.txt
-     ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
-    displayName: 'Verify Readmes'
-
-  - pwsh: |
-      mkdir "$(Build.ArtifactStagingDirectory)/reports"
-      Copy-Item -Path "$(Build.SourcesDirectory)/eng/common/InterdependencyGraph.html" -Destination "$(Build.ArtifactStagingDirectory)/reports/InterdependencyGraph.html"
-    displayName: 'Populate Reports Staging Folder'
-
-  - task: PythonScript@0
-    displayName: 'Analyze dependencies'
-    inputs:
-     scriptPath: 'scripts/analyze_deps.py'
-     arguments: '--verbose --out "$(Build.ArtifactStagingDirectory)/reports/dependencies.html" --dump "$(Build.ArtifactStagingDirectory)/reports/data.js"'
+  - template: /eng/pipelines/templates/steps/analyze_dependency.yml
 
   - task: PythonScript@0
     displayName: 'Verify Change Log'
@@ -97,6 +73,12 @@ steps:
       BuildTargetingString: ${{ parameters.BuildTargetingString }}
       TestMarkArgument: ${{ parameters.TestMarkArgument }}
 
+  - task: DownloadPipelineArtifact@0
+    condition: ne(variables['Skip.ApiStubGen'],'true')
+    inputs:
+      artifactName: 'artifacts'
+      targetPath: $(Build.ArtifactStagingDirectory)
+
   - template: ../steps/run_apistub.yml
     parameters:
       ServiceDirectory: ${{ parameters.ServiceDirectory }}
diff --git a/eng/pipelines/templates/steps/analyze_dependency.yml b/eng/pipelines/templates/steps/analyze_dependency.yml
new file mode 100644
index 000000000000..77ab69df6dd3
--- /dev/null
+++ b/eng/pipelines/templates/steps/analyze_dependency.yml
@@ -0,0 +1,21 @@
+steps:
+  - task: UsePythonVersion@0
+    displayName: 'Use Python $(PythonVersion)'
+    inputs:
+     versionSpec: '$(PythonVersion)'
+
+  - script: |
+     pip install -r eng/ci_tools.txt
+     ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
+    displayName: 'Verify Readmes'
+
+  - pwsh: |
+      mkdir "$(Build.ArtifactStagingDirectory)/reports"
+      Copy-Item -Path "$(Build.SourcesDirectory)/eng/common/InterdependencyGraph.html" -Destination "$(Build.ArtifactStagingDirectory)/reports/InterdependencyGraph.html"
+    displayName: 'Populate Reports Staging Folder'
+
+  - task: PythonScript@0
+    displayName: 'Analyze dependencies'
+    inputs:
+     scriptPath: 'scripts/analyze_deps.py'
+     arguments: '--verbose --out "$(Build.ArtifactStagingDirectory)/reports/dependencies.html" --dump "$(Build.ArtifactStagingDirectory)/reports/data.js"'
\ No newline at end of file