From c39da05094bc5000c5b7a3b99defe01cd420f378 Mon Sep 17 00:00:00 2001
From: Doris Ruppert <Doris.Ruppert@partner.bmw.de>
Date: Thu, 23 Mar 2023 19:24:36 +0100
Subject: [PATCH 1/2] OPMAAS-3527 updated product structure in CN PreProd

---
 .../PD_AccountManagementConnectedCar.tf       | 26 +++++--
 .../PD_AutomotiveSecurity.tf                  | 67 +++++++++++++++---
 .../PD_management_zone/PD_CallServices.tf     | 48 +++++++++++--
 .../PD_ConnectedDriveStoreBackend.tf          | 44 ++++++++++--
 .../PD_ConnectedSecurityServices.tf           | 57 ++++++++++++++++
 .../PD_ConnectedUserProfileServices.tf        | 20 +++++-
 .../PD_ConversationServices.tf                | 21 ++++++
 .../PD_InfotainmentInteractivityServices.tf   | 53 ++++++++++++---
 ..._InfotainmentInteractivityServicesChina.tf | 21 ++++++
 .../PD_management_zone/PD_LocationServices.tf | 31 ++++++++-
 .../PD_MapServicesAutomatedDriving.tf         | 32 ++++++++-
 .../PD_MyBMWMINIAppAsAProduct.tf              | 12 ++++
 .../PD_NavigationServices.tf                  | 31 ++++++++-
 .../PD_RemoteMessagingServices.tf             | 38 +++++++++--
 ...PD_RemoteVehicleConfigurationManagement.tf | 68 +++++++++++++++++--
 .../PD_management_zone/PD_Teleservices.tf     | 57 ++++++++++++++--
 .../PD_VehicleDataCollection.tf               | 49 +++++++++++--
 .../PD_VehicleDataConnectivity.tf             | 38 ++++++++++-
 .../PD_eSIMandStaticVehicleDataServices.tf    | 22 +++++-
 19 files changed, 670 insertions(+), 65 deletions(-)
 create mode 100644 CN_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
 create mode 100644 CN_PREPROD/PD_management_zone/PD_ConversationServices.tf
 create mode 100644 CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf

diff --git a/CN_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/CN_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 6003d56..60f6464 100644
--- a/CN_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/CN_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index ef5433c..80ddb87 100644
--- a/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -1,27 +1,78 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
   }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Vehicle Software Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Smart Access
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Key Management Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Feature Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_CallServices.tf b/CN_PREPROD/PD_management_zone/PD_CallServices.tf
index 3f6832e..66cc33c 100644
--- a/CN_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -1,27 +1,63 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed from here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+  }
+
+  // compass product: Conversation Services 
+  // compass sub product: Speech
+  // should be moved to a new management zone PD_ConversationServices
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/CN_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 90a258f..03c37e3 100644
--- a/CN_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/CN_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf b/CN_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
new file mode 100644
index 0000000..b94d546
--- /dev/null
+++ b/CN_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}
diff --git a/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index aab2ef4..b4cf049 100644
--- a/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -1,15 +1,31 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_ConversationServices.tf b/CN_PREPROD/PD_management_zone/PD_ConversationServices.tf
new file mode 100644
index 0000000..c3a8685
--- /dev/null
+++ b/CN_PREPROD/PD_management_zone/PD_ConversationServices.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}
diff --git a/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index c7ad0db..e85579c 100644
--- a/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -1,5 +1,7 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
@@ -8,28 +10,61 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     enabled = true 
     selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
   }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
+
+  // compass product: Infotainment & Interactivity Services China
+  // no sub product
+  // moved to new management zone PD_InfotainmentInteractivityServicesChina
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
   }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf b/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
new file mode 100644
index 0000000..71a8678
--- /dev/null
+++ b/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}
diff --git a/CN_PREPROD/PD_management_zone/PD_LocationServices.tf b/CN_PREPROD/PD_management_zone/PD_LocationServices.tf
index 1d90274..f938612 100644
--- a/CN_PREPROD/PD_management_zone/PD_LocationServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_LocationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/CN_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 728c428..f4c8b19 100644
--- a/CN_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/CN_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/CN_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 8211e0c..a9d1ad9 100644
--- a/CN_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/CN_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -1,5 +1,17 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
diff --git a/CN_PREPROD/PD_management_zone/PD_NavigationServices.tf b/CN_PREPROD/PD_management_zone/PD_NavigationServices.tf
index 3388d86..8479705 100644
--- a/CN_PREPROD/PD_management_zone/PD_NavigationServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_NavigationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf b/CN_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
index 22cc04a..ea67cb2 100644
--- a/CN_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/CN_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index 190dff6..ecb7e84 100644
--- a/CN_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/CN_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_Teleservices.tf b/CN_PREPROD/PD_management_zone/PD_Teleservices.tf
index 0cda2c4..40b92be 100644
--- a/CN_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index 126c3e4..d7c3a7b 100644
--- a/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -1,19 +1,56 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 7e2d8ed..4fd94f6 100644
--- a/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+  // compass product: Vehicle Device Mgmt.
+  // compass sub product: Provisioning Services
+  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/CN_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 49c4992..8e9ca92 100644
--- a/CN_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }

From fd41b66c5550599b96101514b38654f0f23ca01e Mon Sep 17 00:00:00 2001
From: Doris Ruppert <Doris.Ruppert@partner.bmw.de>
Date: Mon, 27 Mar 2023 11:28:01 +0200
Subject: [PATCH 2/2] OPMAAS-3527 updated product structure in all hubs

---
 .../PD_AccountManagementConnectedCar.tf       | 26 ++++-
 .../PD_AutomotiveSecurity.tf                  | 67 +++++++++++--
 CN_PROD/PD_management_zone/PD_CallServices.tf | 48 ++++++++--
 .../PD_ConnectedDriveStoreBackend.tf          | 44 ++++++++-
 .../PD_ConnectedSecurityServices.tf           | 57 +++++++++++
 .../PD_ConnectedUserProfileServices.tf        | 20 +++-
 .../PD_ConversationServices.tf                | 21 +++++
 .../PD_InfotainmentInteractivityServices.tf   | 53 +++++++++--
 ..._InfotainmentInteractivityServicesChina.tf | 21 +++++
 .../PD_management_zone/PD_LocationServices.tf | 31 +++++-
 .../PD_MapServicesAutomatedDriving.tf         | 32 ++++++-
 .../PD_MyBMWMINIAppAsAProduct.tf              | 12 +++
 .../PD_NavigationServices.tf                  | 31 +++++-
 .../PD_RemoteMessagingServices.tf             | 38 +++++++-
 ...PD_RemoteVehicleConfigurationManagement.tf | 68 ++++++++++++--
 CN_PROD/PD_management_zone/PD_Teleservices.tf | 57 +++++++++--
 .../PD_VehicleDataCollection.tf               | 49 ++++++++--
 .../PD_VehicleDataConnectivity.tf             | 38 +++++++-
 .../PD_eSIMandStaticVehicleDataServices.tf    | 22 ++++-
 .../PD_AccountManagementConnectedCar.tf       | 26 ++++-
 .../PD_AutomotiveSecurity.tf                  | 67 +++++++++++--
 .../PD_management_zone/PD_CallServices.tf     | 48 ++++++++--
 .../PD_ConnectedDriveStoreBackend.tf          | 44 ++++++++-
 .../PD_ConnectedSecurityServices.tf           | 57 +++++++++++
 .../PD_ConnectedUserProfileServices.tf        | 20 +++-
 .../PD_ConversationServices.tf                | 21 +++++
 .../PD_InfotainmentInteractivityServices.tf   | 53 +++++++++--
 ..._InfotainmentInteractivityServicesChina.tf | 21 +++++
 .../PD_management_zone/PD_LocationServices.tf | 31 +++++-
 .../PD_MapServicesAutomatedDriving.tf         | 32 ++++++-
 .../PD_MyBMWMINIAppAsAProduct.tf              | 12 +++
 .../PD_NavigationServices.tf                  | 31 +++++-
 .../PD_RemoteMessagingServices.tf             | 38 +++++++-
 ...PD_RemoteVehicleConfigurationManagement.tf | 68 ++++++++++++--
 .../PD_management_zone/PD_Teleservices.tf     | 57 +++++++++--
 .../PD_VehicleDataCollection.tf               | 49 ++++++++--
 .../PD_VehicleDataConnectivity.tf             | 38 +++++++-
 .../PD_eSIMandStaticVehicleDataServices.tf    | 22 ++++-
 .../PD_AccountManagementConnectedCar.tf       | 26 ++++-
 .../PD_AutomotiveSecurity.tf                  | 67 +++++++++++--
 .../PD_management_zone/PD_CallServices.tf     | 94 +++++++++----------
 .../PD_ConnectedDriveStoreBackend.tf          | 44 ++++++++-
 .../PD_ConnectedSecurityServices.tf           | 57 +++++++++++
 .../PD_ConnectedUserProfileServices.tf        | 20 +++-
 .../PD_ConversationServices.tf                | 21 +++++
 .../PD_InfotainmentInteractivityServices.tf   | 53 +++++++++--
 ..._InfotainmentInteractivityServicesChina.tf | 21 +++++
 .../PD_management_zone/PD_LocationServices.tf | 31 +++++-
 .../PD_MapServicesAutomatedDriving.tf         | 32 ++++++-
 .../PD_MyBMWMINIAppAsAProduct.tf              | 16 +++-
 .../PD_NavigationServices.tf                  | 31 +++++-
 .../PD_RemoteMessagingServices.tf             | 66 ++++++-------
 ...PD_RemoteVehicleConfigurationManagement.tf | 68 ++++++++++++--
 .../PD_management_zone/PD_Teleservices.tf     | 57 +++++++++--
 .../PD_VehicleDataCollection.tf               | 49 ++++++++--
 .../PD_VehicleDataConnectivity.tf             | 38 +++++++-
 .../PD_eSIMandStaticVehicleDataServices.tf    | 22 ++++-
 .../PD_AccountManagementConnectedCar.tf       | 26 ++++-
 .../PD_AutomotiveSecurity.tf                  | 67 +++++++++++--
 .../PD_management_zone/PD_CallServices.tf     | 58 ++++++++++--
 .../PD_ConnectedDriveStoreBackend.tf          | 44 ++++++++-
 .../PD_ConnectedSecurityServices.tf           | 57 +++++++++++
 .../PD_ConnectedUserProfileServices.tf        | 20 +++-
 .../PD_ConversationServices.tf                | 21 +++++
 .../PD_InfotainmentInteractivityServices.tf   | 53 +++++++++--
 ..._InfotainmentInteractivityServicesChina.tf | 21 +++++
 .../PD_management_zone/PD_LocationServices.tf | 31 +++++-
 .../PD_MapServicesAutomatedDriving.tf         | 32 ++++++-
 .../PD_MyBMWMINIAppAsAProduct.tf              | 12 +++
 .../PD_NavigationServices.tf                  | 31 +++++-
 .../PD_RemoteMessagingServices.tf             | 38 +++++++-
 ...PD_RemoteVehicleConfigurationManagement.tf | 68 ++++++++++++--
 .../PD_management_zone/PD_Teleservices.tf     | 57 +++++++++--
 .../PD_VehicleDataCollection.tf               | 49 ++++++++--
 .../PD_VehicleDataConnectivity.tf             | 38 +++++++-
 .../PD_eSIMandStaticVehicleDataServices.tf    | 22 ++++-
 .../PD_AccountManagementConnectedCar.tf       | 26 ++++-
 .../PD_AutomotiveSecurity.tf                  | 67 +++++++++++--
 NA_PROD/PD_management_zone/PD_CallServices.tf | 58 ++++++++++--
 .../PD_ConnectedDriveStoreBackend.tf          | 44 ++++++++-
 .../PD_ConnectedSecurityServices.tf           | 57 +++++++++++
 .../PD_ConnectedUserProfileServices.tf        | 20 +++-
 .../PD_ConversationServices.tf                | 21 +++++
 .../PD_InfotainmentInteractivityServices.tf   | 53 +++++++++--
 ..._InfotainmentInteractivityServicesChina.tf | 21 +++++
 .../PD_management_zone/PD_LocationServices.tf | 31 +++++-
 .../PD_MapServicesAutomatedDriving.tf         | 32 ++++++-
 .../PD_MyBMWMINIAppAsAProduct.tf              | 12 +++
 .../PD_NavigationServices.tf                  | 31 +++++-
 .../PD_RemoteMessagingServices.tf             | 50 ++++++----
 ...PD_RemoteVehicleConfigurationManagement.tf | 68 ++++++++++++--
 NA_PROD/PD_management_zone/PD_Teleservices.tf | 57 +++++++++--
 .../PD_VehicleDataCollection.tf               | 49 ++++++++--
 .../PD_VehicleDataConnectivity.tf             | 38 +++++++-
 .../PD_eSIMandStaticVehicleDataServices.tf    | 22 ++++-
 95 files changed, 3363 insertions(+), 422 deletions(-)
 create mode 100644 CN_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
 create mode 100644 CN_PROD/PD_management_zone/PD_ConversationServices.tf
 create mode 100644 CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
 create mode 100644 EMEA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
 create mode 100644 EMEA_PREPROD/PD_management_zone/PD_ConversationServices.tf
 create mode 100644 EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
 create mode 100644 EMEA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
 create mode 100644 EMEA_PROD/PD_management_zone/PD_ConversationServices.tf
 create mode 100644 EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
 create mode 100644 NA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
 create mode 100644 NA_PREPROD/PD_management_zone/PD_ConversationServices.tf
 create mode 100644 NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
 create mode 100644 NA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
 create mode 100644 NA_PROD/PD_management_zone/PD_ConversationServices.tf
 create mode 100644 NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf

diff --git a/CN_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/CN_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 6003d56..60f6464 100644
--- a/CN_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/CN_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index ef5433c..80ddb87 100644
--- a/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -1,27 +1,78 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
   }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Vehicle Software Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Smart Access
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Key Management Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Feature Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_CallServices.tf b/CN_PROD/PD_management_zone/PD_CallServices.tf
index 3f6832e..66cc33c 100644
--- a/CN_PROD/PD_management_zone/PD_CallServices.tf
+++ b/CN_PROD/PD_management_zone/PD_CallServices.tf
@@ -1,27 +1,63 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed from here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+  }
+
+  // compass product: Conversation Services 
+  // compass sub product: Speech
+  // should be moved to a new management zone PD_ConversationServices
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/CN_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 90a258f..03c37e3 100644
--- a/CN_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/CN_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf b/CN_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
new file mode 100644
index 0000000..b94d546
--- /dev/null
+++ b/CN_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}
diff --git a/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index aab2ef4..b4cf049 100644
--- a/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -1,15 +1,31 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_ConversationServices.tf b/CN_PROD/PD_management_zone/PD_ConversationServices.tf
new file mode 100644
index 0000000..c3a8685
--- /dev/null
+++ b/CN_PROD/PD_management_zone/PD_ConversationServices.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}
diff --git a/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index c7ad0db..e85579c 100644
--- a/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -1,5 +1,7 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
@@ -8,28 +10,61 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     enabled = true 
     selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
   }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
+
+  // compass product: Infotainment & Interactivity Services China
+  // no sub product
+  // moved to new management zone PD_InfotainmentInteractivityServicesChina
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
   }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf b/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
new file mode 100644
index 0000000..71a8678
--- /dev/null
+++ b/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}
diff --git a/CN_PROD/PD_management_zone/PD_LocationServices.tf b/CN_PROD/PD_management_zone/PD_LocationServices.tf
index 1d90274..f938612 100644
--- a/CN_PROD/PD_management_zone/PD_LocationServices.tf
+++ b/CN_PROD/PD_management_zone/PD_LocationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }
diff --git a/CN_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/CN_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 728c428..f4c8b19 100644
--- a/CN_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/CN_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/CN_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 8211e0c..a9d1ad9 100644
--- a/CN_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/CN_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -1,5 +1,17 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
diff --git a/CN_PROD/PD_management_zone/PD_NavigationServices.tf b/CN_PROD/PD_management_zone/PD_NavigationServices.tf
index 3388d86..8479705 100644
--- a/CN_PROD/PD_management_zone/PD_NavigationServices.tf
+++ b/CN_PROD/PD_management_zone/PD_NavigationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_RemoteMessagingServices.tf b/CN_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
index 22cc04a..ea67cb2 100644
--- a/CN_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/CN_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/CN_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index 190dff6..ecb7e84 100644
--- a/CN_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/CN_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_Teleservices.tf b/CN_PROD/PD_management_zone/PD_Teleservices.tf
index 0cda2c4..40b92be 100644
--- a/CN_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/CN_PROD/PD_management_zone/PD_Teleservices.tf
@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }
diff --git a/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index 126c3e4..d7c3a7b 100644
--- a/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -1,19 +1,56 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 7e2d8ed..4fd94f6 100644
--- a/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+  // compass product: Vehicle Device Mgmt.
+  // compass sub product: Provisioning Services
+  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }
diff --git a/CN_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/CN_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 49c4992..8e9ca92 100644
--- a/CN_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/CN_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 6003d56..60f6464 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index ef5433c..80ddb87 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -1,27 +1,78 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
   }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Vehicle Software Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Smart Access
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Key Management Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Feature Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf b/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
index 3f6832e..66cc33c 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -1,27 +1,63 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed from here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+  }
+
+  // compass product: Conversation Services 
+  // compass sub product: Speech
+  // should be moved to a new management zone PD_ConversationServices
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 90a258f..03c37e3 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf b/EMEA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
new file mode 100644
index 0000000..b94d546
--- /dev/null
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index aab2ef4..b4cf049 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -1,15 +1,31 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConversationServices.tf b/EMEA_PREPROD/PD_management_zone/PD_ConversationServices.tf
new file mode 100644
index 0000000..c3a8685
--- /dev/null
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConversationServices.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}
diff --git a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index c7ad0db..e85579c 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -1,5 +1,7 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
@@ -8,28 +10,61 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     enabled = true 
     selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
   }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
+
+  // compass product: Infotainment & Interactivity Services China
+  // no sub product
+  // moved to new management zone PD_InfotainmentInteractivityServicesChina
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
   }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
new file mode 100644
index 0000000..71a8678
--- /dev/null
+++ b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}
diff --git a/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf b/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf
index 1d90274..f938612 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 728c428..f4c8b19 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/EMEA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 8211e0c..a9d1ad9 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -1,5 +1,17 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
diff --git a/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf b/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf
index 3388d86..8479705 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf b/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
index 22cc04a..ea67cb2 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index 190dff6..ecb7e84 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf b/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
index 0cda2c4..40b92be 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index 126c3e4..d7c3a7b 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -1,19 +1,56 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 7e2d8ed..4fd94f6 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+  // compass product: Vehicle Device Mgmt.
+  // compass sub product: Provisioning Services
+  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 49c4992..8e9ca92 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 6003d56..60f6464 100644
--- a/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index ef5433c..80ddb87 100644
--- a/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -1,27 +1,78 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
   }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Vehicle Software Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Smart Access
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Key Management Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Feature Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_CallServices.tf b/EMEA_PROD/PD_management_zone/PD_CallServices.tf
index 5e07145..66cc33c 100644
--- a/EMEA_PROD/PD_management_zone/PD_CallServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_CallServices.tf
@@ -1,63 +1,63 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
-  rules {
-    type = "PROCESS_GROUP" 
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
     enabled = true 
-    propagation_types = ["PROCESS_GROUP_TO_SERVICE"] 
-    conditions {
-      custom_process_metadata {
-        attribute = "PROCESS_GROUP_CUSTOM_METADATA" 
-        dynamic_key {
-          key = "compass-id" 
-          source = "KUBERNETES" 
-        }
-      }
-      string {
-        # case_sensitive = false 
-        # negate = false 
-        operator = "BEGINS_WITH" 
-        value = "ecs" 
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
   }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed from here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+  }
+
+  // compass product: Conversation Services 
+  // compass sub product: Speech
+  // should be moved to a new management zone PD_ConversationServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 90a258f..03c37e3 100644
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
new file mode 100644
index 0000000..b94d546
--- /dev/null
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}
diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index aab2ef4..b4cf049 100644
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -1,15 +1,31 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_ConversationServices.tf b/EMEA_PROD/PD_management_zone/PD_ConversationServices.tf
new file mode 100644
index 0000000..c3a8685
--- /dev/null
+++ b/EMEA_PROD/PD_management_zone/PD_ConversationServices.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}
diff --git a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index c7ad0db..e85579c 100644
--- a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -1,5 +1,7 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
@@ -8,28 +10,61 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     enabled = true 
     selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
   }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
+
+  // compass product: Infotainment & Interactivity Services China
+  // no sub product
+  // moved to new management zone PD_InfotainmentInteractivityServicesChina
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
   }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
new file mode 100644
index 0000000..71a8678
--- /dev/null
+++ b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}
diff --git a/EMEA_PROD/PD_management_zone/PD_LocationServices.tf b/EMEA_PROD/PD_management_zone/PD_LocationServices.tf
index 1d90274..f938612 100644
--- a/EMEA_PROD/PD_management_zone/PD_LocationServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_LocationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 728c428..f4c8b19 100644
--- a/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 157b01d..a9d1ad9 100644
--- a/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -1,11 +1,19 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     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
diff --git a/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf b/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf
index 3388d86..8479705 100644
--- a/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf b/EMEA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
index 5e55d11..ea67cb2 100644
--- a/EMEA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -1,47 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(service),tag(\"compass-id:eadb\",\"compass-id:icnb\",\"compass-id:msgsvc\",\"compass-id:omgw\",\"compass-id:tcn\",\"compass-id:xcc-campaigns\",\"compass-id:xcc-cmgr\",\"compass-id:xcc-settings\",\"compass-id:xcc-statistics\",\"compass-id:xcc-users\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
-  rules {
-    type = "MOBILE_APPLICATION" 
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
     enabled = true 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "MOBILE_APPLICATION_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "CONTAINS" 
-        value = "2.0" 
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
   }
-  rules {
-    type = "SERVICE" 
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
     enabled = true 
-    propagation_types = ["SERVICE_TO_HOST_LIKE","SERVICE_TO_PROCESS_GROUP_LIKE"] 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_TAGS" 
-      }
-      tag {
-        # negate = false 
-        operator = "EQUALS" 
-        value {
-          context = "CONTEXTLESS" 
-          key = "compass-id" 
-          value = "rs" 
-        }
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
   }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index 190dff6..ecb7e84 100644
--- a/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_Teleservices.tf b/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
index 0cda2c4..40b92be 100644
--- a/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index 126c3e4..d7c3a7b 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -1,19 +1,56 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 7e2d8ed..4fd94f6 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+  // compass product: Vehicle Device Mgmt.
+  // compass sub product: Provisioning Services
+  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/EMEA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 49c4992..8e9ca92 100644
--- a/EMEA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 6003d56..60f6464 100644
--- a/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index ef5433c..80ddb87 100644
--- a/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -1,27 +1,78 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
   }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Vehicle Software Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Smart Access
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Key Management Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Feature Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_CallServices.tf b/NA_PREPROD/PD_management_zone/PD_CallServices.tf
index 1cd73b9..66cc33c 100644
--- a/NA_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -1,23 +1,63 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
+  }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
+  }
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed from here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
-  }
+
+  // compass product: Conversation Services 
+  // compass sub product: Speech
+  // should be moved to a new management zone PD_ConversationServices
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 90a258f..03c37e3 100644
--- a/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf b/NA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
new file mode 100644
index 0000000..b94d546
--- /dev/null
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf
@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}
diff --git a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index aab2ef4..b4cf049 100644
--- a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -1,15 +1,31 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_ConversationServices.tf b/NA_PREPROD/PD_management_zone/PD_ConversationServices.tf
new file mode 100644
index 0000000..c3a8685
--- /dev/null
+++ b/NA_PREPROD/PD_management_zone/PD_ConversationServices.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}
diff --git a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index c7ad0db..e85579c 100644
--- a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -1,5 +1,7 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
@@ -8,28 +10,61 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     enabled = true 
     selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
   }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
+
+  // compass product: Infotainment & Interactivity Services China
+  // no sub product
+  // moved to new management zone PD_InfotainmentInteractivityServicesChina
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
   }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
new file mode 100644
index 0000000..71a8678
--- /dev/null
+++ b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}
diff --git a/NA_PREPROD/PD_management_zone/PD_LocationServices.tf b/NA_PREPROD/PD_management_zone/PD_LocationServices.tf
index 1d90274..f938612 100644
--- a/NA_PREPROD/PD_management_zone/PD_LocationServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_LocationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 728c428..f4c8b19 100644
--- a/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/NA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 8211e0c..a9d1ad9 100644
--- a/NA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/NA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -1,5 +1,17 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
diff --git a/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf b/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf
index 3388d86..8479705 100644
--- a/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf b/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
index 22cc04a..ea67cb2 100644
--- a/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index 190dff6..ecb7e84 100644
--- a/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_Teleservices.tf b/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
index 0cda2c4..40b92be 100644
--- a/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index 126c3e4..d7c3a7b 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -1,19 +1,56 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 7e2d8ed..4fd94f6 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+  // compass product: Vehicle Device Mgmt.
+  // compass sub product: Provisioning Services
+  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/NA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 49c4992..8e9ca92 100644
--- a/NA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 6003d56..60f6464 100644
--- a/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index ef5433c..80ddb87 100644
--- a/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -1,27 +1,78 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
   }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Vehicle Software Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
   }
+
+  // compass product: Connected Security Services
+  // compass sub product: Smart Access
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Key Management Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass product: Connected Security Services
+  // compass sub product: Feature Security Services
+  // should be moved to a new management zone PD_ConnectedSecurityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_CallServices.tf b/NA_PROD/PD_management_zone/PD_CallServices.tf
index 1cd73b9..66cc33c 100644
--- a/NA_PROD/PD_management_zone/PD_CallServices.tf
+++ b/NA_PROD/PD_management_zone/PD_CallServices.tf
@@ -1,23 +1,63 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
+  }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
+  }
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed from here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
-  }
+
+  // compass product: Conversation Services 
+  // compass sub product: Speech
+  // should be moved to a new management zone PD_ConversationServices
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/NA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 90a258f..03c37e3 100644
--- a/NA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/NA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf b/NA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
new file mode 100644
index 0000000..b94d546
--- /dev/null
+++ b/NA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf
@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}
diff --git a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index aab2ef4..b4cf049 100644
--- a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -1,15 +1,31 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_ConversationServices.tf b/NA_PROD/PD_management_zone/PD_ConversationServices.tf
new file mode 100644
index 0000000..c3a8685
--- /dev/null
+++ b/NA_PROD/PD_management_zone/PD_ConversationServices.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}
diff --git a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index c7ad0db..e85579c 100644
--- a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -1,5 +1,7 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
@@ -8,28 +10,61 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     enabled = true 
     selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
   }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
+
+  // compass product: Infotainment & Interactivity Services China
+  // no sub product
+  // moved to new management zone PD_InfotainmentInteractivityServicesChina
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
   }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
new file mode 100644
index 0000000..71a8678
--- /dev/null
+++ b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf
@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}
diff --git a/NA_PROD/PD_management_zone/PD_LocationServices.tf b/NA_PROD/PD_management_zone/PD_LocationServices.tf
index 1d90274..f938612 100644
--- a/NA_PROD/PD_management_zone/PD_LocationServices.tf
+++ b/NA_PROD/PD_management_zone/PD_LocationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }
diff --git a/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 728c428..f4c8b19 100644
--- a/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf b/NA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
index 8211e0c..a9d1ad9 100644
--- a/NA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
+++ b/NA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf
@@ -1,5 +1,17 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
diff --git a/NA_PROD/PD_management_zone/PD_NavigationServices.tf b/NA_PROD/PD_management_zone/PD_NavigationServices.tf
index 3388d86..8479705 100644
--- a/NA_PROD/PD_management_zone/PD_NavigationServices.tf
+++ b/NA_PROD/PD_management_zone/PD_NavigationServices.tf
@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf b/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
index d8459ff..ea67cb2 100644
--- a/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -1,27 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
-  rules {
-    type = "MOBILE_APPLICATION" 
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
     enabled = true 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "MOBILE_APPLICATION_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "CONTAINS" 
-        value = "2.0" 
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index 190dff6..ecb7e84 100644
--- a/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_Teleservices.tf b/NA_PROD/PD_management_zone/PD_Teleservices.tf
index 0cda2c4..40b92be 100644
--- a/NA_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/NA_PROD/PD_management_zone/PD_Teleservices.tf
@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }
diff --git a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index 126c3e4..d7c3a7b 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -1,19 +1,56 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+  }
+
+  // compass product: Vehicle Demand Identification and Lead Management
+  // compass sub product: Service Partner Management
+  // moved to PD_Teleservices, should be removed here
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 7e2d8ed..4fd94f6 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+  // compass product: Vehicle Device Mgmt.
+  // compass sub product: Provisioning Services
+  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }
diff --git a/NA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/NA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 49c4992..8e9ca92 100644
--- a/NA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/NA_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }