diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 6396de28ef68b..c468ebd85216c 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -237,7 +237,7 @@ jobs:
 
       - task: Maven@3
         displayName: 'Start Jetty'
-        condition: ne(variables['EnableJetty'], 'false')
+        condition: ne(variables['SdkType'], 'client')
         inputs:
           mavenPomFile: pom.client.xml
           options: '$(DefaultOptions) $(ProfileFlag)'
diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 86f34aff2e795..53e3914312073 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -34,6 +34,7 @@ pr:
       - sdk/keyvault/microsoft-azure
 
 
+
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 6aaf0c69b41fd..d64ee420186b6 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -12,8 +12,8 @@
       <id>data</id>
       <activation>
         <property>
-          <name>env.ENABLEJETTY</name>
-          <value>true</value>
+          <name>env.SDKTYPE</name>
+          <value>data</value>
         </property>
       </activation>
       <modules>
@@ -30,8 +30,8 @@
       <id>client</id>
       <activation>
         <property>
-          <name>env.ENABLEJETTY</name>
-          <value>!true</value>
+          <name>env.SDKTYPE</name>
+          <value>!data</value>
         </property>
       </activation>
       <modules>