diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 8acfedd..3e93303 100644
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -12,6 +12,10 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+  }
   rules {
     type = "SERVICE" 
     # enabled = false 
diff --git a/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 8211e0c..157b01d 100644
--- a/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -4,4 +4,8 @@ resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:send-to-car-service\",\"compass-id:trip-service\")" 
+  }
 }
\ No newline at end of file