diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml
index 90791c6cc2c7..a05c5b99a298 100644
--- a/sdk/eventhub/ci.yml
+++ b/sdk/eventhub/ci.yml
@@ -31,6 +31,7 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: eventhub
+    BuildTargetingString: azure-eventhub*
     # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837
     MatrixConfigs:
       - Name: eventhub_ci_matrix
@@ -46,5 +47,3 @@ extends:
       safeName: azureeventhubcheckpointstoreblobaio
     - name: azure-eventhub-checkpointstoreblob
       safeName: azureeventhubcheckpointstoreblob
-    - name: azure-mgmt-eventhub
-      safeName: azuremgmteventhub
diff --git a/sdk/servicebus/ci.yml b/sdk/servicebus/ci.yml
index 3b01ab6633c5..f3b6763bc992 100644
--- a/sdk/servicebus/ci.yml
+++ b/sdk/servicebus/ci.yml
@@ -29,11 +29,10 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: servicebus
+    BuildTargetingString: azure-servicebus*
     MatrixFilters:
       - PythonVersion=^(?!pypy3).*
     Artifacts:
-    - name: azure-mgmt-servicebus
-      safeName: azuremgmtservicebus
     - name: azure-servicebus
       safeName: azureservicebus