diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
index be3e543b1a44b..a4e6c32e82aad 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -12,7 +12,7 @@ jobs:
       - task: Maven@3
         displayName: 'Run Live tests'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.xml
+          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
           options: '--batch-mode -Dmaven.wagon.http.pool=false -Dsurefire.rerunFailingTestsCount=3'
           mavenOptions: '-Xmx3072m -Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           javaHomeOption: 'JDKVersion'
diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
index cdd6903f0aac0..4a7716cf8392f 100644
--- a/sdk/keyvault/tests.yml
+++ b/sdk/keyvault/tests.yml
@@ -1,11 +1,9 @@
 trigger: none
 
 jobs:
-    # When migrating change path to ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
-  - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests-pre-sdk.yml
+  - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
-      # When migrating use ServiceDirectory
-      PomFilePath: './keyvault/data-plane/pom.xml'
+      ServiceDirectory: keyvault
       EnvVars:
         AZURE_TEST_MODE: RECORD
         ARM_CLIENTID: $(java-keyvault-test-arm-client-id)