diff --git a/eng/pipelines/patch-release.yml b/eng/pipelines/patch-release.yml
index f7c486ea04b0..36c1de66addb 100644
--- a/eng/pipelines/patch-release.yml
+++ b/eng/pipelines/patch-release.yml
@@ -27,4 +27,19 @@ extends:
       safeName: azuresdktemplatethree
       skipPublishDocMs: true
       ServiceDirectory: template
+    - name: azure-sdk-template
+      groupId: com.azure.v2
+      safeName: azuresdktemplate
+      skipPublishDocMs: true
+      ServiceDirectory: template-v2
+    - name: azure-sdk-template-two
+      groupId: com.azure.v2
+      safeName: azuresdktemplatetwo
+      skipPublishDocMs: true
+      ServiceDirectory: template-v2
+    - name: azure-sdk-template-three
+      groupId: com.azure.v2
+      safeName: azuresdktemplatethree
+      skipPublishDocMs: true
+      ServiceDirectory: template-v2
 
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml b/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
index 571e5fbb6e56..d22601358369 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
@@ -61,8 +61,10 @@ extends:
 
             - template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
               parameters:
-                PackageNames: "azure-sdk-template,azure-sdk-template-two,azure-sdk-template-three"
-                ServiceDirectory: "template"
+                Artifacts:
+                - ${{ each artifact in parameters.Artifacts }}:
+                  - ${{ if contains(artifact.name, 'azure-sdk-template') }}:
+                    - ${{ artifact }}
                 TestPipeline: ${{parameters.TestPipeline}}
 
             - task: UsePythonVersion@0
@@ -215,8 +217,10 @@ extends:
 
             - template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
               parameters:
-                PackageNames: "azure-sdk-template,azure-sdk-template-two,azure-sdk-template-three"
-                ServiceDirectory: "template"
+                Artifacts:
+                - ${{ each artifact in parameters.Artifacts }}:
+                  - ${{ if contains(artifact.name, 'azure-sdk-template') }}:
+                    - ${{ artifact }}
                 TestPipeline: ${{parameters.TestPipeline}}
 
             - task: PythonScript@0