diff --git a/sdk/keyvault/ci.data.yml b/sdk/keyvault/ci.data.yml
index 1dcf1feddf5d..4c64572c79f9 100644
--- a/sdk/keyvault/ci.data.yml
+++ b/sdk/keyvault/ci.data.yml
@@ -9,22 +9,16 @@ trigger:
   paths:
     include:
       - sdk/keyvault/ci.data.yml
-      - sdk/keyvault/microsoft-azure-keyvault/
       - sdk/keyvault/microsoft-azure-keyvault-complete/
       - sdk/keyvault/microsoft-azure-keyvault-core/
-      - sdk/keyvault/microsoft-azure-keyvault-cryptography/
       - sdk/keyvault/microsoft-azure-keyvault-extensions/
       - sdk/keyvault/microsoft-azure-keyvault-test/
-      - sdk/keyvault/microsoft-azure-keyvault-webkey/
     exclude:
       - sdk/keyvault/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
 
 pr:
   branches:
@@ -36,22 +30,29 @@ pr:
   paths:
     include:
       - sdk/keyvault/ci.data.yml
-      - sdk/keyvault/microsoft-azure-keyvault/
-      - sdk/keyvault/microsoft-azure-keyvault-complete/
       - sdk/keyvault/microsoft-azure-keyvault-core/
-      - sdk/keyvault/microsoft-azure-keyvault-cryptography/
       - sdk/keyvault/microsoft-azure-keyvault-extensions/
       - sdk/keyvault/microsoft-azure-keyvault-test/
-      - sdk/keyvault/microsoft-azure-keyvault-webkey/
     exclude:
       - sdk/keyvault/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
       - sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
-      - sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
+
+parameters:
+- name: release_azurekeyvaultcore
+  displayName: 'azure-keyvault-core'
+  type: boolean
+  default: true
+- name: release_azurekeyvaultextensions
+  displayName: 'azure-keyvault-extensions'
+  type: boolean
+  default: true
+- name: release_azurekeyvaultcomplete
+  displayName: 'azure-keyvault-complete'
+  type: boolean
+  default: true
+
 
 extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -59,18 +60,15 @@ extends:
     SDKType: data
     ServiceDirectory: keyvault
     Artifacts:
-      - name: azure-keyvault
-        groupId: com.microsoft.azure
-        safeName: azurekeyvault
       - name: azure-keyvault-core
         groupId: com.microsoft.azure
         safeName: azurekeyvaultcore
-      - name: azure-keyvault-cryptography
-        groupId: com.microsoft.azure
-        safeName: azurekeyvaultcryptography
+        releaseInBatch: ${{ parameters.release_azurekeyvaultcore }}
       - name: azure-keyvault-extensions
         groupId: com.microsoft.azure
         safeName: azurekeyvaultextensions
-      - name: azure-keyvault-webkey
+        releaseInBatch: ${{ parameters.release_azurekeyvaultextensions }}
+      - name: azure-keyvault-complete
         groupId: com.microsoft.azure
-        safeName: azurekeyvaultwebkey
+        safeName: azurekeyvaultcomplete
+        releaseInBatch: ${{ parameters.release_azurekeyvaultcomplete }}