diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index c915a0ad4dd84..a42f6188f7cdf 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -55,7 +55,7 @@ jobs:
     steps:
       - task: PowerShell@2
         displayName: Prep template pipeline for release
-        condition: and(succeeded(),eq(variables['TestPipeline'],'true'))
+        condition: and(succeeded(),eq('${{ parameters.TestPipeline }}','true'))
         inputs:
           pwsh: true
           workingDirectory: $(Build.SourcesDirectory)
diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml
index 9dac55291ca6d..c637babb13834 100644
--- a/eng/pipelines/templates/stages/archetype-java-release.yml
+++ b/eng/pipelines/templates/stages/archetype-java-release.yml
@@ -63,7 +63,7 @@ stages:
             steps:
               - task: PowerShell@2
                 displayName: Prep template pipeline for release
-                condition: and(succeeded(),eq(variables['TestPipeline'],'true'))
+                condition: and(succeeded(),eq('${{ parameters.TestPipeline }}','true'))
                 inputs:
                   pwsh: true
                   workingDirectory: $(Build.SourcesDirectory)
@@ -185,6 +185,7 @@ stages:
                           DocRepoDestinationPath: 'docs-ref-services/'
                           GHReviewersVariable: 'OwningGHUser'
                           CIConfigs: $(CIConfigs)
+                          CloseAfterOpenForTesting: '${{ parameters.TestPipeline }}'
 
           - ${{if ne(artifact.skipPublishDocGithubIo, 'true')}}:
             - deployment: PublishDocs
diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml
index fc1e0dbf5eca3..dd134830740c2 100644
--- a/sdk/template/ci.yml
+++ b/sdk/template/ci.yml
@@ -9,7 +9,6 @@ trigger:
   paths:
     include:
       - sdk/template/
-      - eng/common/
 
 pr:
   branches:
@@ -26,6 +25,7 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: template
+    TestPipeline: true
     Artifacts:
       - name: azure-sdk-template
         groupId: com.azure