diff --git a/CN_PROD/management_zone/CD_Mobile-vehicledata.tf b/CN_PROD/management_zone/CD_Mobile-vehicledata.tf
index bbfbc6a7..804d0e33 100644
--- a/CN_PROD/management_zone/CD_Mobile-vehicledata.tf
+++ b/CN_PROD/management_zone/CD_Mobile-vehicledata.tf
@@ -4,25 +4,13 @@ resource "dynatrace_management_zone" "CD_mobile_vehicledata" {
     enabled  = true
     selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-VC\",\"compass-id:vehicle-service\")"
   }
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Environment:PROD\")"
-  }
   entity_selector_based_rule {
     enabled  = true
     selector = "type(HOST),tag(\"compass-id:mobile20-VC\",\"compass-id:vehicle-service\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"Environment:PROD\")"
-  }
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(Service),tag(\"compass-id:mobile20-VC\",\"compass-id:vehicle-service\")"
-  }
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(Service),tag(\"Environment:PROD\")"
+    selector = "type(Service),entityName.in(\"btc-vehicle-composite-service - PROD\",\"VehicleService - PROD\")"
   }
   entity_selector_based_rule {
     enabled  = true
@@ -30,6 +18,10 @@ resource "dynatrace_management_zone" "CD_mobile_vehicledata" {
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Environment:PROD\"))"
+    selector = "type(Container_GROUP_INSTANCE),entityName.startswith(\"vehicle-composite-service\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Container_GROUP_INSTANCE),entityName.startswith(\"vehicle-service\")"
   }
 }