diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index a44742b8a082..2579afadd273 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -148,8 +148,8 @@ jobs:
 
       - 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"
+          ArtifactsJson: '${{ convertToJson(parameters.ReleaseArtifacts) }}'
+          ServiceDirectory: ${{ parameters.ServiceDirectory }}
           TestPipeline: ${{ parameters.TestPipeline }}
 
       # The daily dev build variable isn't used for the PullRequests pipeline but is currently used
@@ -351,8 +351,8 @@ jobs:
 
       - 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"
+          ArtifactsJson: '${{ convertToJson(parameters.ReleaseArtifacts) }}'
+          ServiceDirectory: ${{ parameters.ServiceDirectory }}
           TestPipeline: ${{ parameters.TestPipeline }}
 
       - template: /eng/common/pipelines/templates/steps/verify-links.yml
diff --git a/eng/pipelines/templates/stages/archetype-java-release-batch.yml b/eng/pipelines/templates/stages/archetype-java-release-batch.yml
index f50b06a2839a..7f4c27037ebe 100644
--- a/eng/pipelines/templates/stages/archetype-java-release-batch.yml
+++ b/eng/pipelines/templates/stages/archetype-java-release-batch.yml
@@ -127,8 +127,8 @@ stages:
 
             - 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"
+                ArtifactsJson: '$(ArtifactsJson)'
+                ServiceDirectory: ${{ parameters.ServiceDirectory }}
                 TestPipeline: ${{ parameters.TestPipeline }}
 
             # Do all the verifications for all the artifacts after the sparse-checkout