diff --git a/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index c6bdced..ef5433c 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -2,26 +2,26 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\"),tag(\"compass-id:ASBC-SBB\"),tag(\"compass-id:ASBCSWLSEC2\"),tag(\"compass-id:PSdZ-Checker\"),tag(\"compass-id:SCB\"),tag(\"compass-id:SCC\"),tag(\"compass-id:SWAG\"),tag(\"compass-id:SWLSEC2-Checker\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\"),tag(\"compass-id:ASBC-AFWSFA-POC\"),tag(\"compass-id:ASBC-AFWSTM-POC\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\"),tag(\"compass-id:CAC\"),tag(\"compass-id:CAC-AGENT\"),tag(\"compass-id:SMC2-BL\"),tag(\"compass-id:SMC2-KEY-TRK\"),tag(\"compass-id:SMC2-RT\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\"),tag(\"compass-id:DFPH\"),tag(\"compass-id:OCLISc2v\"),tag(\"compass-id:OCLISocsp\"),tag(\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\"),tag(\"compass-id:STM\"),tag(\"compass-id:ts-wlupdater\"),tag(\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\"),tag(\"compass-id:ASBC-NGTP\"),tag(\"compass-id:ASBS\"),tag(\"compass-id:HPAuth\"),tag(\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf b/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
index 8265cea..3f6832e 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -2,26 +2,26 @@ resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\"),tag(\"compass-id:PISA-EVENT-HANDLER\"),tag(\"compass-id:PISA-RUNTIME\")" 
+    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:B2V-Voice\"),tag(\"compass-id:CRS\"),tag(\"compass-id:CRSA\"),tag(\"compass-id:EPL\"),tag(\"compass-id:EPM\"),tag(\"compass-id:VOICEGW\"),tag(\"compass-id:VOICEGW-ADMIN\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\"),tag(\"compass-id:CCC\"),tag(\"compass-id:RSA\"),tag(\"compass-id:RSA-ASD-Search\")" 
+    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(\"PROCESS_GROUP\"),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\"),tag(\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\"),tag(\"compass-id:APPCALL\"),tag(\"compass-id:B2V-NGTP\"),tag(\"compass-id:ECALLGW\"),tag(\"compass-id:ECS\"),tag(\"compass-id:EVNS2\"),tag(\"compass-id:EVNS2T\"),tag(\"compass-id:NGTP-CS\"),tag(\"compass-id:XCS\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 8735460..802fd8b 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Buffet-Birt\"),tag(\"compass-id:Buffet-CIC-Backend\"),tag(\"compass-id:Buffet-Core\"),tag(\"compass-id:Buffet-External-CDM\"),tag(\"compass-id:Buffet-External-Offer\"),tag(\"compass-id:Buffet-External-Payment\"),tag(\"compass-id:Buffet-External-Tax\"),tag(\"compass-id:Buffet-GAM\"),tag(\"compass-id:Buffet-IF33\"),tag(\"compass-id:Buffet-IF38\"),tag(\"compass-id:Buffet-IF41\"),tag(\"compass-id:Buffet-IF50\"),tag(\"compass-id:Buffet-IF51\"),tag(\"compass-id:Buffet-IF52\"),tag(\"compass-id:Buffet-IF53\"),tag(\"compass-id:Buffet-IF54\"),tag(\"compass-id:Buffet-IF58\"),tag(\"compass-id:Buffet-IF60\"),tag(\"compass-id:Buffet-IF90\"),tag(\"compass-id:Buffet-Promo-API\"),tag(\"compass-id:IME-CDS\"),tag(\"compass-id:IME-CS\"),tag(\"compass-id:IME-RDC\"),tag(\"compass-id:IME-SS\"),tag(\"compass-id:IME-WS\")" 
+    selector = "type(Service),tag(\"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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -10,6 +10,6 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\"),tag(\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 4b5ed02..36725a7 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\"),tag(\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
+    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -10,6 +10,6 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\"),tag(\"compass-id:DPP\"),tag(\"compass-id:PERSEUS\"),tag(\"compass-id:PIABO\"),tag(\"compass-id:PIAEP\"),tag(\"compass-id:PIAOP\"),tag(\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index d948e70..82cf6aa 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ambient-music\"),tag(\"compass-id:festive-mode\")" 
+    selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\"),tag(\"compass-id:Geolocator\"),tag(\"compass-id:intelligent-reminder\"),tag(\"compass-id:news-next\"),tag(\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -14,10 +14,10 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\"),tag(\"compass-id:ID5\"),tag(\"compass-id:ID5-APP\"),tag(\"compass-id:ID5-EXT\"),tag(\"compass-id:ISE-BEV\"),tag(\"compass-id:ISE-CDR\"),tag(\"compass-id:ISE-EML\"),tag(\"compass-id:ISE-GEN2\"),tag(\"compass-id:ISE-ID7\"),tag(\"compass-id:ISE-INP\"),tag(\"compass-id:ISE-IPA\"),tag(\"compass-id:ISE-LIS\"),tag(\"compass-id:ISE-LOC\"),tag(\"compass-id:ISE-MCL\"),tag(\"compass-id:ISE-NEWS\"),tag(\"compass-id:ISE-PAR\"),tag(\"compass-id:ISE-RSL\"),tag(\"compass-id:ISE-VPS\"),tag(\"compass-id:ISE-VSD\"),tag(\"compass-id:tmpp-admin-ui\"),tag(\"compass-id:tmpp-manifest\"),tag(\"compass-id:tmpp-web-proxy\"),tag(\"compass-id:UPS\"),tag(\"compass-id:WEA\"),tag(\"compass-id:WEA-ID5\"),tag(\"compass-id:WEA-IN-MAP\")" 
+    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\"),tag(\"compass-id:cm-gracenote\"),tag(\"compass-id:cm-spotify\"),tag(\"compass-id:cm-ximalaya\"),tag(\"compass-id:OED\"),tag(\"compass-id:OED-CN\"),tag(\"compass-id:OEG\"),tag(\"compass-id:OEG-CN\"),tag(\"compass-id:OEO\"),tag(\"compass-id:OEO-CN\"),tag(\"compass-id:OEP\"),tag(\"compass-id:OEP-CN\"),tag(\"compass-id:OES\"),tag(\"compass-id:OES-CN\"),tag(\"compass-id:OET\"),tag(\"compass-id:OET-CN\"),tag(\"compass-id:shortvideo\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf b/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf
index 0027a4a..1d90274 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ercaf\"),tag(\"compass-id:ERCR\"),tag(\"compass-id:ERTP\")" 
+    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\"),tag(\"compass-id:potholes-reader\"),tag(\"compass-id:potholes-service\"),tag(\"compass-id:sc-reader\"),tag(\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"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\"),tag(\"compass-id:GCS\"),tag(\"compass-id:LOS-CHA\"),tag(\"compass-id:LOS-CHA-CNV\"),tag(\"compass-id:LOS-JOY\"),tag(\"compass-id:LOS-MOD\"),tag(\"compass-id:LOS-MSC\"),tag(\"compass-id:LOS-OPS\"),tag(\"compass-id:LOS-PAR\"),tag(\"compass-id:LOS-PER\"),tag(\"compass-id:LOS-REF\"),tag(\"compass-id:RES-PAR\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 10cf285..728c428 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\"),tag(\"compass-id:ms-hdmap-map-viewer\"),tag(\"compass-id:ms-hdmap-mci-adapter\"),tag(\"compass-id:ms-hdmap-mci-downloader\"),tag(\"compass-id:ms-hdmap-nds-downloader\"),tag(\"compass-id:ms-hdmap-qc-bl\"),tag(\"compass-id:ms-hdmap-qc-checks\"),tag(\"compass-id:ms-hdmap-tile-delivery\"),tag(\"compass-id:ms-hdmap-tile-generator\"),tag(\"compass-id:ms-hdmap-vehicle-mock\"),tag(\"compass-id:mupi-backend\"),tag(\"compass-id:MUPI-BE\"),tag(\"compass-id:mupi-cloud-discovery-service\"),tag(\"compass-id:mupi-cloud-dumm-adapter-service\"),tag(\"compass-id:mupi-cloud-hd-adapter-service\"),tag(\"compass-id:mupi-cloud-import-service\"),tag(\"compass-id:mupi-cloud-integration-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-class-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-service\"),tag(\"compass-id:mupi-cloud-stats-service\"),tag(\"compass-id:mupi-cockpit\"),tag(\"compass-id:mupi-gateway\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\"),tag(\"compass-id:gnss-reader\"),tag(\"compass-id:gnss-service\"),tag(\"compass-id:ms-3dp-rc\"),tag(\"compass-id:tc-app\"),tag(\"compass-id:tc-service\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf b/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf
index a820f67..3388d86 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf
@@ -6,10 +6,10 @@ resource "dynatrace_management_zone" "PD_NavigationServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\"),tag(\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\"),tag(\"compass-id:eRoute\"),tag(\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf b/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
index a5d176b..22cc04a 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\"),tag(\"compass-id:FMC\"),tag(\"compass-id:RS\"),tag(\"compass-id:RS360\"),tag(\"compass-id:RSCockpit\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\"),tag(\"compass-id:ICNB\"),tag(\"compass-id:MSGSVC\"),tag(\"compass-id:OMGW\"),tag(\"compass-id:TCN\"),tag(\"compass-id:XCC-CAMPAIGNS\"),tag(\"compass-id:XCC-CMGR\"),tag(\"compass-id:XCC-SETTINGS\"),tag(\"compass-id:XCC-STATISTICS\"),tag(\"compass-id:XCC-USERS\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index bcf59a9..190dff6 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SFA-FRE\"),tag(\"compass-id:SFA-OH\"),tag(\"compass-id:SFA-OTA\"),tag(\"compass-id:SFA-S\"),tag(\"compass-id:SFA-TS\")" 
+    selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\"),tag(\"compass-id:comfy-cockpit\"),tag(\"compass-id:comfy-management\"),tag(\"compass-id:comfy-orchestration\"),tag(\"compass-id:NOP-Admin\"),tag(\"compass-id:NOP-Archive\"),tag(\"compass-id:NOP-Provisioning\"),tag(\"compass-id:NOP-Trigger\"),tag(\"compass-id:SCM\"),tag(\"compass-id:SCMA\"),tag(\"compass-id:VPS-Admin\"),tag(\"compass-id:VPS-Archive\"),tag(\"compass-id:VPS-Monitor\"),tag(\"compass-id:VPS-Prov\"),tag(\"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\",\"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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APR\"),tag(\"compass-id:APR-NPM\"),tag(\"compass-id:APR-Portal\"),tag(\"compass-id:APR-Registry\")" 
+    selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\"),tag(\"compass-id:ZDI\"),tag(\"compass-id:ZFUS-MP-GENERATOR\"),tag(\"compass-id:ZIP\"),tag(\"compass-id:zis\"),tag(\"compass-id:ZMP\"),tag(\"compass-id:ZOS\")" 
+    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\"),tag(\"compass-id:FRS\"),tag(\"compass-id:MPG\"),tag(\"compass-id:QMC\"),tag(\"compass-id:RCM\"),tag(\"compass-id:RCP\"),tag(\"compass-id:RCS\"),tag(\"compass-id:RDC\"),tag(\"compass-id:RDH\"),tag(\"compass-id:RES\"),tag(\"compass-id:RLM\"),tag(\"compass-id:RMO\"),tag(\"compass-id:RNB App\"),tag(\"compass-id:RNP\"),tag(\"compass-id:RPP\"),tag(\"compass-id:RSA Admin GUI\"),tag(\"compass-id:RSA Testbench GUI\"),tag(\"compass-id:RTE\"),tag(\"compass-id:RTS\"),tag(\"compass-id:RVC\"),tag(\"compass-id:RVE\"),tag(\"compass-id:RVI\"),tag(\"compass-id:RVS\"),tag(\"compass-id:RVT\"),tag(\"compass-id:rwd\"),tag(\"compass-id:tdp\"),tag(\"compass-id:uvm\"),tag(\"compass-id:vjm\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf b/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
index 6fedd6c..0cda2c4 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\"),tag(\"compass-id:PDMUpdater\"),tag(\"compass-id:ts-ena-ui\"),tag(\"compass-id:WLManager\"),tag(\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\"),tag(\"compass-id:CAS-SPM\"),tag(\"compass-id:CAS-STM\"),tag(\"compass-id:DiagService\"),tag(\"compass-id:ESHAD\"),tag(\"compass-id:patchcampaign\"),tag(\"compass-id:RTCAD\"),tag(\"compass-id:RTCHandler\"),tag(\"compass-id:RTCService\"),tag(\"compass-id:ts-bcallhandler\"),tag(\"compass-id:ts-cts-ui\"),tag(\"compass-id:ts-pat-ui\"),tag(\"compass-id:TSRD\"),tag(\"compass-id:ts-rtc-ui\")" 
+    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\"),tag(\"compass-id:SCallService\"),tag(\"compass-id:SEAM\"),tag(\"compass-id:ts-asc\"),tag(\"compass-id:TSBGService\"),tag(\"compass-id:TSBM\"),tag(\"compass-id:TS-CCM-DI\"),tag(\"compass-id:TSCS\"),tag(\"compass-id:TSDD\"),tag(\"compass-id:TSMR\"),tag(\"compass-id:TS-PFFS\"),tag(\"compass-id:TSSB-BT\"),tag(\"compass-id:TSSB-BTI\"),tag(\"compass-id:TSSB-TSP\"),tag(\"compass-id:TS-SDI\"),tag(\"compass-id:ts-tyredi\"),tag(\"compass-id:ts-tyrewf\"),tag(\"compass-id:TTBS\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index ca9a645..fbf9304 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\"),tag(\"compass-id:TSMB\"),tag(\"compass-id:TSR-CH\"),tag(\"compass-id:TSR-CMA\"),tag(\"compass-id:TSR-DD\"),tag(\"compass-id:TSR-ICC\"),tag(\"compass-id:TSR-VU\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\"),tag(\"compass-id:TOL MGU\"),tag(\"compass-id:TOL-TSSB\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\"),tag(\"compass-id:ERDCDC2FCD\"),tag(\"compass-id:ERDDISP\"),tag(\"compass-id:ERDFCDUDS\"),tag(\"compass-id:ERDMGR\"),tag(\"compass-id:ERDPROC\"),tag(\"compass-id:ERDXFCDFCD\"),tag(\"compass-id:XFCD Cockpit\"),tag(\"compass-id:XFCD Configuration\"),tag(\"compass-id:XFCDAnonymizer\")" 
+    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:IDS-SVDS\"),tag(\"compass-id:IDS-Sync\"),tag(\"compass-id:IDS-WS\")" 
+    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\"),tag(\"compass-id:CSI\"),tag(\"compass-id:CSU\"),tag(\"compass-id:LSCFSU\"),tag(\"compass-id:LSCHR\"),tag(\"compass-id:LSCJHWO\"),tag(\"compass-id:LSCJR\"),tag(\"compass-id:LSCKC\"),tag(\"compass-id:LSCMM\"),tag(\"compass-id:LSCOC\"),tag(\"compass-id:LSCOG\"),tag(\"compass-id:LSCWO\"),tag(\"compass-id:tripCollection\"),tag(\"compass-id:vdc-vcs\"),tag(\"compass-id:VHCJR\"),tag(\"compass-id:VHS\"),tag(\"compass-id:VJDS\"),tag(\"compass-id:VNS\"),tag(\"compass-id:VS-API\"),tag(\"compass-id:VSFO\"),tag(\"compass-id:VSST\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 67ad968..7e2d8ed 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-ADC\"),tag(\"compass-id:B2V-ADC-CLOUD\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\"),tag(\"compass-id:UDS\"),tag(\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\"),tag(\"compass-id:B2V-COM-ECHO\"),tag(\"compass-id:B2V-COM-FE\"),tag(\"compass-id:B2VCOMGCDMCLIENT\"),tag(\"compass-id:B2V-NOTS\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index b386d93..30a55d9 100644
--- a/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\"),tag(\"compass-id:AM-CASA\"),tag(\"compass-id:am-cloud\"),tag(\"compass-id:AM-CNR\"),tag(\"compass-id:AM-CNS\"),tag(\"compass-id:AM-ECS\"),tag(\"compass-id:AM-LMCS\"),tag(\"compass-id:AM-Proxy\"),tag(\"compass-id:AM-Store\"),tag(\"compass-id:AM-SVMS\"),tag(\"compass-id:AM-SVMS-EventService\"),tag(\"compass-id:AM-USAGE\"),tag(\"compass-id:AM-VAS\"),tag(\"compass-id:AM-Vehicle\"),tag(\"compass-id:AM-VMS\"),tag(\"compass-id:Countly\"),tag(\"compass-id:TAMSArchive\"),tag(\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\"),tag(\"compass-id:AM-Device\"),tag(\"compass-id:AM-EGIM\"),tag(\"compass-id:AM-MNO-Manager\"),tag(\"compass-id:CESIM Proxy\"),tag(\"compass-id:MNOMGR-CU-Jasper\"),tag(\"compass-id:MNOMGR-CU-SHA\"),tag(\"compass-id:MNOMGR-GD\"),tag(\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index c6bdced..ef5433c 100644
--- a/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -2,26 +2,26 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\"),tag(\"compass-id:ASBC-SBB\"),tag(\"compass-id:ASBCSWLSEC2\"),tag(\"compass-id:PSdZ-Checker\"),tag(\"compass-id:SCB\"),tag(\"compass-id:SCC\"),tag(\"compass-id:SWAG\"),tag(\"compass-id:SWLSEC2-Checker\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\"),tag(\"compass-id:ASBC-AFWSFA-POC\"),tag(\"compass-id:ASBC-AFWSTM-POC\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\"),tag(\"compass-id:CAC\"),tag(\"compass-id:CAC-AGENT\"),tag(\"compass-id:SMC2-BL\"),tag(\"compass-id:SMC2-KEY-TRK\"),tag(\"compass-id:SMC2-RT\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\"),tag(\"compass-id:DFPH\"),tag(\"compass-id:OCLISc2v\"),tag(\"compass-id:OCLISocsp\"),tag(\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\"),tag(\"compass-id:STM\"),tag(\"compass-id:ts-wlupdater\"),tag(\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\"),tag(\"compass-id:ASBC-NGTP\"),tag(\"compass-id:ASBS\"),tag(\"compass-id:HPAuth\"),tag(\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_CallServices.tf b/EMEA_PROD/PD_management_zone/PD_CallServices.tf
index 5d422ad..5e07145 100644
--- a/EMEA_PROD/PD_management_zone/PD_CallServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_CallServices.tf
@@ -2,43 +2,43 @@ resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\"),tag(\"compass-id:PISA-EVENT-HANDLER\"),tag(\"compass-id:PISA-RUNTIME\")" 
+    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:B2V-Voice\"),tag(\"compass-id:CRS\"),tag(\"compass-id:CRSA\"),tag(\"compass-id:EPL\"),tag(\"compass-id:EPM\"),tag(\"compass-id:VOICEGW\"),tag(\"compass-id:VOICEGW-ADMIN\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:B2V-Voice\"),tag(\"compass-id:CRS\"),tag(\"compass-id:CRSA\"),tag(\"compass-id:EPL\"),tag(\"compass-id:EPM\"),tag(\"compass-id:VOICEGW\"),tag(\"compass-id:VOICEGW-ADMIN\")" 
+    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\"),tag(\"compass-id:CCC\"),tag(\"compass-id:RSA\"),tag(\"compass-id:RSA-ASD-Search\")" 
+    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\"),tag(\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\"),tag(\"compass-id:APPCALL\"),tag(\"compass-id:B2V-NGTP\"),tag(\"compass-id:ECALLGW\"),tag(\"compass-id:ECS\"),tag(\"compass-id:EVNS2\"),tag(\"compass-id:EVNS2T\"),tag(\"compass-id:NGTP-CS\"),tag(\"compass-id:XCS\")" 
+    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\"),tag(\"compass-id:HVD\")" 
+    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\"),tag(\"compass-id:PISA-EVENT-HANDLER\"),tag(\"compass-id:PISA-RUNTIME\")" 
+    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\"),tag(\"compass-id:CCC\"),tag(\"compass-id:RSA\"),tag(\"compass-id:RSA-ASD-Search\")" 
+    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(\"PROCESS_GROUP\"),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
   rules {
     type = "PROCESS_GROUP" 
diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 42e9c16..945f0a2 100644
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -10,6 +10,6 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\"),tag(\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 6a49965..8acfedd 100644
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
   entity_selector_based_rule {
     # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\"),tag(\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
+    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
   }
   entity_selector_based_rule {
     # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\"),tag(\"compass-id:DPP\"),tag(\"compass-id:PERSEUS\"),tag(\"compass-id:PIABO\"),tag(\"compass-id:PIAEP\"),tag(\"compass-id:PIAOP\"),tag(\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
   entity_selector_based_rule {
     enabled = true 
diff --git a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index d948e70..82cf6aa 100644
--- a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ambient-music\"),tag(\"compass-id:festive-mode\")" 
+    selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\"),tag(\"compass-id:Geolocator\"),tag(\"compass-id:intelligent-reminder\"),tag(\"compass-id:news-next\"),tag(\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -14,10 +14,10 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\"),tag(\"compass-id:ID5\"),tag(\"compass-id:ID5-APP\"),tag(\"compass-id:ID5-EXT\"),tag(\"compass-id:ISE-BEV\"),tag(\"compass-id:ISE-CDR\"),tag(\"compass-id:ISE-EML\"),tag(\"compass-id:ISE-GEN2\"),tag(\"compass-id:ISE-ID7\"),tag(\"compass-id:ISE-INP\"),tag(\"compass-id:ISE-IPA\"),tag(\"compass-id:ISE-LIS\"),tag(\"compass-id:ISE-LOC\"),tag(\"compass-id:ISE-MCL\"),tag(\"compass-id:ISE-NEWS\"),tag(\"compass-id:ISE-PAR\"),tag(\"compass-id:ISE-RSL\"),tag(\"compass-id:ISE-VPS\"),tag(\"compass-id:ISE-VSD\"),tag(\"compass-id:tmpp-admin-ui\"),tag(\"compass-id:tmpp-manifest\"),tag(\"compass-id:tmpp-web-proxy\"),tag(\"compass-id:UPS\"),tag(\"compass-id:WEA\"),tag(\"compass-id:WEA-ID5\"),tag(\"compass-id:WEA-IN-MAP\")" 
+    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\"),tag(\"compass-id:cm-gracenote\"),tag(\"compass-id:cm-spotify\"),tag(\"compass-id:cm-ximalaya\"),tag(\"compass-id:OED\"),tag(\"compass-id:OED-CN\"),tag(\"compass-id:OEG\"),tag(\"compass-id:OEG-CN\"),tag(\"compass-id:OEO\"),tag(\"compass-id:OEO-CN\"),tag(\"compass-id:OEP\"),tag(\"compass-id:OEP-CN\"),tag(\"compass-id:OES\"),tag(\"compass-id:OES-CN\"),tag(\"compass-id:OET\"),tag(\"compass-id:OET-CN\"),tag(\"compass-id:shortvideo\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_LocationServices.tf b/EMEA_PROD/PD_management_zone/PD_LocationServices.tf
index 0027a4a..1d90274 100644
--- a/EMEA_PROD/PD_management_zone/PD_LocationServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_LocationServices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ercaf\"),tag(\"compass-id:ERCR\"),tag(\"compass-id:ERTP\")" 
+    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\"),tag(\"compass-id:potholes-reader\"),tag(\"compass-id:potholes-service\"),tag(\"compass-id:sc-reader\"),tag(\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"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\"),tag(\"compass-id:GCS\"),tag(\"compass-id:LOS-CHA\"),tag(\"compass-id:LOS-CHA-CNV\"),tag(\"compass-id:LOS-JOY\"),tag(\"compass-id:LOS-MOD\"),tag(\"compass-id:LOS-MSC\"),tag(\"compass-id:LOS-OPS\"),tag(\"compass-id:LOS-PAR\"),tag(\"compass-id:LOS-PER\"),tag(\"compass-id:LOS-REF\"),tag(\"compass-id:RES-PAR\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 10cf285..728c428 100644
--- a/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\"),tag(\"compass-id:ms-hdmap-map-viewer\"),tag(\"compass-id:ms-hdmap-mci-adapter\"),tag(\"compass-id:ms-hdmap-mci-downloader\"),tag(\"compass-id:ms-hdmap-nds-downloader\"),tag(\"compass-id:ms-hdmap-qc-bl\"),tag(\"compass-id:ms-hdmap-qc-checks\"),tag(\"compass-id:ms-hdmap-tile-delivery\"),tag(\"compass-id:ms-hdmap-tile-generator\"),tag(\"compass-id:ms-hdmap-vehicle-mock\"),tag(\"compass-id:mupi-backend\"),tag(\"compass-id:MUPI-BE\"),tag(\"compass-id:mupi-cloud-discovery-service\"),tag(\"compass-id:mupi-cloud-dumm-adapter-service\"),tag(\"compass-id:mupi-cloud-hd-adapter-service\"),tag(\"compass-id:mupi-cloud-import-service\"),tag(\"compass-id:mupi-cloud-integration-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-class-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-service\"),tag(\"compass-id:mupi-cloud-stats-service\"),tag(\"compass-id:mupi-cockpit\"),tag(\"compass-id:mupi-gateway\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\"),tag(\"compass-id:gnss-reader\"),tag(\"compass-id:gnss-service\"),tag(\"compass-id:ms-3dp-rc\"),tag(\"compass-id:tc-app\"),tag(\"compass-id:tc-service\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf b/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf
index a820f67..3388d86 100644
--- a/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_NavigationServices.tf
@@ -6,10 +6,10 @@ resource "dynatrace_management_zone" "PD_NavigationServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\"),tag(\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\"),tag(\"compass-id:eRoute\"),tag(\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index bcf59a9..190dff6 100644
--- a/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SFA-FRE\"),tag(\"compass-id:SFA-OH\"),tag(\"compass-id:SFA-OTA\"),tag(\"compass-id:SFA-S\"),tag(\"compass-id:SFA-TS\")" 
+    selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\"),tag(\"compass-id:comfy-cockpit\"),tag(\"compass-id:comfy-management\"),tag(\"compass-id:comfy-orchestration\"),tag(\"compass-id:NOP-Admin\"),tag(\"compass-id:NOP-Archive\"),tag(\"compass-id:NOP-Provisioning\"),tag(\"compass-id:NOP-Trigger\"),tag(\"compass-id:SCM\"),tag(\"compass-id:SCMA\"),tag(\"compass-id:VPS-Admin\"),tag(\"compass-id:VPS-Archive\"),tag(\"compass-id:VPS-Monitor\"),tag(\"compass-id:VPS-Prov\"),tag(\"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\",\"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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APR\"),tag(\"compass-id:APR-NPM\"),tag(\"compass-id:APR-Portal\"),tag(\"compass-id:APR-Registry\")" 
+    selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\"),tag(\"compass-id:ZDI\"),tag(\"compass-id:ZFUS-MP-GENERATOR\"),tag(\"compass-id:ZIP\"),tag(\"compass-id:zis\"),tag(\"compass-id:ZMP\"),tag(\"compass-id:ZOS\")" 
+    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\"),tag(\"compass-id:FRS\"),tag(\"compass-id:MPG\"),tag(\"compass-id:QMC\"),tag(\"compass-id:RCM\"),tag(\"compass-id:RCP\"),tag(\"compass-id:RCS\"),tag(\"compass-id:RDC\"),tag(\"compass-id:RDH\"),tag(\"compass-id:RES\"),tag(\"compass-id:RLM\"),tag(\"compass-id:RMO\"),tag(\"compass-id:RNB App\"),tag(\"compass-id:RNP\"),tag(\"compass-id:RPP\"),tag(\"compass-id:RSA Admin GUI\"),tag(\"compass-id:RSA Testbench GUI\"),tag(\"compass-id:RTE\"),tag(\"compass-id:RTS\"),tag(\"compass-id:RVC\"),tag(\"compass-id:RVE\"),tag(\"compass-id:RVI\"),tag(\"compass-id:RVS\"),tag(\"compass-id:RVT\"),tag(\"compass-id:rwd\"),tag(\"compass-id:tdp\"),tag(\"compass-id:uvm\"),tag(\"compass-id:vjm\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_Teleservices.tf b/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
index 6fedd6c..0cda2c4 100644
--- a/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\"),tag(\"compass-id:PDMUpdater\"),tag(\"compass-id:ts-ena-ui\"),tag(\"compass-id:WLManager\"),tag(\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\"),tag(\"compass-id:CAS-SPM\"),tag(\"compass-id:CAS-STM\"),tag(\"compass-id:DiagService\"),tag(\"compass-id:ESHAD\"),tag(\"compass-id:patchcampaign\"),tag(\"compass-id:RTCAD\"),tag(\"compass-id:RTCHandler\"),tag(\"compass-id:RTCService\"),tag(\"compass-id:ts-bcallhandler\"),tag(\"compass-id:ts-cts-ui\"),tag(\"compass-id:ts-pat-ui\"),tag(\"compass-id:TSRD\"),tag(\"compass-id:ts-rtc-ui\")" 
+    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\"),tag(\"compass-id:SCallService\"),tag(\"compass-id:SEAM\"),tag(\"compass-id:ts-asc\"),tag(\"compass-id:TSBGService\"),tag(\"compass-id:TSBM\"),tag(\"compass-id:TS-CCM-DI\"),tag(\"compass-id:TSCS\"),tag(\"compass-id:TSDD\"),tag(\"compass-id:TSMR\"),tag(\"compass-id:TS-PFFS\"),tag(\"compass-id:TSSB-BT\"),tag(\"compass-id:TSSB-BTI\"),tag(\"compass-id:TSSB-TSP\"),tag(\"compass-id:TS-SDI\"),tag(\"compass-id:ts-tyredi\"),tag(\"compass-id:ts-tyrewf\"),tag(\"compass-id:TTBS\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index ca9a645..fbf9304 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\"),tag(\"compass-id:TSMB\"),tag(\"compass-id:TSR-CH\"),tag(\"compass-id:TSR-CMA\"),tag(\"compass-id:TSR-DD\"),tag(\"compass-id:TSR-ICC\"),tag(\"compass-id:TSR-VU\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\"),tag(\"compass-id:TOL MGU\"),tag(\"compass-id:TOL-TSSB\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\"),tag(\"compass-id:ERDCDC2FCD\"),tag(\"compass-id:ERDDISP\"),tag(\"compass-id:ERDFCDUDS\"),tag(\"compass-id:ERDMGR\"),tag(\"compass-id:ERDPROC\"),tag(\"compass-id:ERDXFCDFCD\"),tag(\"compass-id:XFCD Cockpit\"),tag(\"compass-id:XFCD Configuration\"),tag(\"compass-id:XFCDAnonymizer\")" 
+    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:IDS-SVDS\"),tag(\"compass-id:IDS-Sync\"),tag(\"compass-id:IDS-WS\")" 
+    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\"),tag(\"compass-id:CSI\"),tag(\"compass-id:CSU\"),tag(\"compass-id:LSCFSU\"),tag(\"compass-id:LSCHR\"),tag(\"compass-id:LSCJHWO\"),tag(\"compass-id:LSCJR\"),tag(\"compass-id:LSCKC\"),tag(\"compass-id:LSCMM\"),tag(\"compass-id:LSCOC\"),tag(\"compass-id:LSCOG\"),tag(\"compass-id:LSCWO\"),tag(\"compass-id:tripCollection\"),tag(\"compass-id:vdc-vcs\"),tag(\"compass-id:VHCJR\"),tag(\"compass-id:VHS\"),tag(\"compass-id:VJDS\"),tag(\"compass-id:VNS\"),tag(\"compass-id:VS-API\"),tag(\"compass-id:VSFO\"),tag(\"compass-id:VSST\")" 
+    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\")" 
   }
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 67ad968..7e2d8ed 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-ADC\"),tag(\"compass-id:B2V-ADC-CLOUD\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\"),tag(\"compass-id:UDS\"),tag(\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\"),tag(\"compass-id:B2V-COM-ECHO\"),tag(\"compass-id:B2V-COM-FE\"),tag(\"compass-id:B2VCOMGCDMCLIENT\"),tag(\"compass-id:B2V-NOTS\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index b386d93..30a55d9 100644
--- a/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\"),tag(\"compass-id:AM-CASA\"),tag(\"compass-id:am-cloud\"),tag(\"compass-id:AM-CNR\"),tag(\"compass-id:AM-CNS\"),tag(\"compass-id:AM-ECS\"),tag(\"compass-id:AM-LMCS\"),tag(\"compass-id:AM-Proxy\"),tag(\"compass-id:AM-Store\"),tag(\"compass-id:AM-SVMS\"),tag(\"compass-id:AM-SVMS-EventService\"),tag(\"compass-id:AM-USAGE\"),tag(\"compass-id:AM-VAS\"),tag(\"compass-id:AM-Vehicle\"),tag(\"compass-id:AM-VMS\"),tag(\"compass-id:Countly\"),tag(\"compass-id:TAMSArchive\"),tag(\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\"),tag(\"compass-id:AM-Device\"),tag(\"compass-id:AM-EGIM\"),tag(\"compass-id:AM-MNO-Manager\"),tag(\"compass-id:CESIM Proxy\"),tag(\"compass-id:MNOMGR-CU-Jasper\"),tag(\"compass-id:MNOMGR-CU-SHA\"),tag(\"compass-id:MNOMGR-GD\"),tag(\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index c6bdced..ef5433c 100644
--- a/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -2,26 +2,26 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\"),tag(\"compass-id:ASBC-SBB\"),tag(\"compass-id:ASBCSWLSEC2\"),tag(\"compass-id:PSdZ-Checker\"),tag(\"compass-id:SCB\"),tag(\"compass-id:SCC\"),tag(\"compass-id:SWAG\"),tag(\"compass-id:SWLSEC2-Checker\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\"),tag(\"compass-id:ASBC-AFWSFA-POC\"),tag(\"compass-id:ASBC-AFWSTM-POC\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\"),tag(\"compass-id:CAC\"),tag(\"compass-id:CAC-AGENT\"),tag(\"compass-id:SMC2-BL\"),tag(\"compass-id:SMC2-KEY-TRK\"),tag(\"compass-id:SMC2-RT\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\"),tag(\"compass-id:DFPH\"),tag(\"compass-id:OCLISc2v\"),tag(\"compass-id:OCLISocsp\"),tag(\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\"),tag(\"compass-id:STM\"),tag(\"compass-id:ts-wlupdater\"),tag(\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\"),tag(\"compass-id:ASBC-NGTP\"),tag(\"compass-id:ASBS\"),tag(\"compass-id:HPAuth\"),tag(\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_CallServices.tf b/NA_PREPROD/PD_management_zone/PD_CallServices.tf
index 83507ac..1cd73b9 100644
--- a/NA_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\"),tag(\"compass-id:CRS\"),tag(\"compass-id:CRSA\"),tag(\"compass-id:EPL\"),tag(\"compass-id:EPM\"),tag(\"compass-id:VOICEGW\"),tag(\"compass-id:VOICEGW-ADMIN\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\"),tag(\"compass-id:PISA-EVENT-HANDLER\"),tag(\"compass-id:PISA-RUNTIME\")" 
+    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\"),tag(\"compass-id:CCC\"),tag(\"compass-id:RSA\"),tag(\"compass-id:RSA-ASD-Search\")" 
+    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\"),tag(\"compass-id:APPCALL\"),tag(\"compass-id:B2V-NGTP\"),tag(\"compass-id:ECALLGW\"),tag(\"compass-id:ECS\"),tag(\"compass-id:EVNS2\"),tag(\"compass-id:EVNS2T\"),tag(\"compass-id:NGTP-CS\"),tag(\"compass-id:XCS\")" 
+    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(Service),tag(\"compass-id:HTTS\"),tag(\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf b/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
index 8735460..802fd8b 100644
--- a/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf
@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Buffet-Birt\"),tag(\"compass-id:Buffet-CIC-Backend\"),tag(\"compass-id:Buffet-Core\"),tag(\"compass-id:Buffet-External-CDM\"),tag(\"compass-id:Buffet-External-Offer\"),tag(\"compass-id:Buffet-External-Payment\"),tag(\"compass-id:Buffet-External-Tax\"),tag(\"compass-id:Buffet-GAM\"),tag(\"compass-id:Buffet-IF33\"),tag(\"compass-id:Buffet-IF38\"),tag(\"compass-id:Buffet-IF41\"),tag(\"compass-id:Buffet-IF50\"),tag(\"compass-id:Buffet-IF51\"),tag(\"compass-id:Buffet-IF52\"),tag(\"compass-id:Buffet-IF53\"),tag(\"compass-id:Buffet-IF54\"),tag(\"compass-id:Buffet-IF58\"),tag(\"compass-id:Buffet-IF60\"),tag(\"compass-id:Buffet-IF90\"),tag(\"compass-id:Buffet-Promo-API\"),tag(\"compass-id:IME-CDS\"),tag(\"compass-id:IME-CS\"),tag(\"compass-id:IME-RDC\"),tag(\"compass-id:IME-SS\"),tag(\"compass-id:IME-WS\")" 
+    selector = "type(Service),tag(\"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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -10,6 +10,6 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\"),tag(\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 4b5ed02..36725a7 100644
--- a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\"),tag(\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
+    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -10,6 +10,6 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\"),tag(\"compass-id:DPP\"),tag(\"compass-id:PERSEUS\"),tag(\"compass-id:PIABO\"),tag(\"compass-id:PIAEP\"),tag(\"compass-id:PIAOP\"),tag(\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index d948e70..82cf6aa 100644
--- a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ambient-music\"),tag(\"compass-id:festive-mode\")" 
+    selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\"),tag(\"compass-id:Geolocator\"),tag(\"compass-id:intelligent-reminder\"),tag(\"compass-id:news-next\"),tag(\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -14,10 +14,10 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\"),tag(\"compass-id:ID5\"),tag(\"compass-id:ID5-APP\"),tag(\"compass-id:ID5-EXT\"),tag(\"compass-id:ISE-BEV\"),tag(\"compass-id:ISE-CDR\"),tag(\"compass-id:ISE-EML\"),tag(\"compass-id:ISE-GEN2\"),tag(\"compass-id:ISE-ID7\"),tag(\"compass-id:ISE-INP\"),tag(\"compass-id:ISE-IPA\"),tag(\"compass-id:ISE-LIS\"),tag(\"compass-id:ISE-LOC\"),tag(\"compass-id:ISE-MCL\"),tag(\"compass-id:ISE-NEWS\"),tag(\"compass-id:ISE-PAR\"),tag(\"compass-id:ISE-RSL\"),tag(\"compass-id:ISE-VPS\"),tag(\"compass-id:ISE-VSD\"),tag(\"compass-id:tmpp-admin-ui\"),tag(\"compass-id:tmpp-manifest\"),tag(\"compass-id:tmpp-web-proxy\"),tag(\"compass-id:UPS\"),tag(\"compass-id:WEA\"),tag(\"compass-id:WEA-ID5\"),tag(\"compass-id:WEA-IN-MAP\")" 
+    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\"),tag(\"compass-id:cm-gracenote\"),tag(\"compass-id:cm-spotify\"),tag(\"compass-id:cm-ximalaya\"),tag(\"compass-id:OED\"),tag(\"compass-id:OED-CN\"),tag(\"compass-id:OEG\"),tag(\"compass-id:OEG-CN\"),tag(\"compass-id:OEO\"),tag(\"compass-id:OEO-CN\"),tag(\"compass-id:OEP\"),tag(\"compass-id:OEP-CN\"),tag(\"compass-id:OES\"),tag(\"compass-id:OES-CN\"),tag(\"compass-id:OET\"),tag(\"compass-id:OET-CN\"),tag(\"compass-id:shortvideo\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_LocationServices.tf b/NA_PREPROD/PD_management_zone/PD_LocationServices.tf
index 0027a4a..1d90274 100644
--- a/NA_PREPROD/PD_management_zone/PD_LocationServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_LocationServices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ercaf\"),tag(\"compass-id:ERCR\"),tag(\"compass-id:ERTP\")" 
+    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\"),tag(\"compass-id:potholes-reader\"),tag(\"compass-id:potholes-service\"),tag(\"compass-id:sc-reader\"),tag(\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"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\"),tag(\"compass-id:GCS\"),tag(\"compass-id:LOS-CHA\"),tag(\"compass-id:LOS-CHA-CNV\"),tag(\"compass-id:LOS-JOY\"),tag(\"compass-id:LOS-MOD\"),tag(\"compass-id:LOS-MSC\"),tag(\"compass-id:LOS-OPS\"),tag(\"compass-id:LOS-PAR\"),tag(\"compass-id:LOS-PER\"),tag(\"compass-id:LOS-REF\"),tag(\"compass-id:RES-PAR\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 10cf285..728c428 100644
--- a/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/NA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\"),tag(\"compass-id:ms-hdmap-map-viewer\"),tag(\"compass-id:ms-hdmap-mci-adapter\"),tag(\"compass-id:ms-hdmap-mci-downloader\"),tag(\"compass-id:ms-hdmap-nds-downloader\"),tag(\"compass-id:ms-hdmap-qc-bl\"),tag(\"compass-id:ms-hdmap-qc-checks\"),tag(\"compass-id:ms-hdmap-tile-delivery\"),tag(\"compass-id:ms-hdmap-tile-generator\"),tag(\"compass-id:ms-hdmap-vehicle-mock\"),tag(\"compass-id:mupi-backend\"),tag(\"compass-id:MUPI-BE\"),tag(\"compass-id:mupi-cloud-discovery-service\"),tag(\"compass-id:mupi-cloud-dumm-adapter-service\"),tag(\"compass-id:mupi-cloud-hd-adapter-service\"),tag(\"compass-id:mupi-cloud-import-service\"),tag(\"compass-id:mupi-cloud-integration-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-class-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-service\"),tag(\"compass-id:mupi-cloud-stats-service\"),tag(\"compass-id:mupi-cockpit\"),tag(\"compass-id:mupi-gateway\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\"),tag(\"compass-id:gnss-reader\"),tag(\"compass-id:gnss-service\"),tag(\"compass-id:ms-3dp-rc\"),tag(\"compass-id:tc-app\"),tag(\"compass-id:tc-service\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf b/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf
index a820f67..3388d86 100644
--- a/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_NavigationServices.tf
@@ -6,10 +6,10 @@ resource "dynatrace_management_zone" "PD_NavigationServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\"),tag(\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\"),tag(\"compass-id:eRoute\"),tag(\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf b/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
index a5d176b..22cc04a 100644
--- a/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\"),tag(\"compass-id:FMC\"),tag(\"compass-id:RS\"),tag(\"compass-id:RS360\"),tag(\"compass-id:RSCockpit\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\"),tag(\"compass-id:ICNB\"),tag(\"compass-id:MSGSVC\"),tag(\"compass-id:OMGW\"),tag(\"compass-id:TCN\"),tag(\"compass-id:XCC-CAMPAIGNS\"),tag(\"compass-id:XCC-CMGR\"),tag(\"compass-id:XCC-SETTINGS\"),tag(\"compass-id:XCC-STATISTICS\"),tag(\"compass-id:XCC-USERS\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index bcf59a9..190dff6 100644
--- a/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/NA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SFA-FRE\"),tag(\"compass-id:SFA-OH\"),tag(\"compass-id:SFA-OTA\"),tag(\"compass-id:SFA-S\"),tag(\"compass-id:SFA-TS\")" 
+    selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\"),tag(\"compass-id:comfy-cockpit\"),tag(\"compass-id:comfy-management\"),tag(\"compass-id:comfy-orchestration\"),tag(\"compass-id:NOP-Admin\"),tag(\"compass-id:NOP-Archive\"),tag(\"compass-id:NOP-Provisioning\"),tag(\"compass-id:NOP-Trigger\"),tag(\"compass-id:SCM\"),tag(\"compass-id:SCMA\"),tag(\"compass-id:VPS-Admin\"),tag(\"compass-id:VPS-Archive\"),tag(\"compass-id:VPS-Monitor\"),tag(\"compass-id:VPS-Prov\"),tag(\"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\",\"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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APR\"),tag(\"compass-id:APR-NPM\"),tag(\"compass-id:APR-Portal\"),tag(\"compass-id:APR-Registry\")" 
+    selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\"),tag(\"compass-id:ZDI\"),tag(\"compass-id:ZFUS-MP-GENERATOR\"),tag(\"compass-id:ZIP\"),tag(\"compass-id:zis\"),tag(\"compass-id:ZMP\"),tag(\"compass-id:ZOS\")" 
+    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\"),tag(\"compass-id:FRS\"),tag(\"compass-id:MPG\"),tag(\"compass-id:QMC\"),tag(\"compass-id:RCM\"),tag(\"compass-id:RCP\"),tag(\"compass-id:RCS\"),tag(\"compass-id:RDC\"),tag(\"compass-id:RDH\"),tag(\"compass-id:RES\"),tag(\"compass-id:RLM\"),tag(\"compass-id:RMO\"),tag(\"compass-id:RNB App\"),tag(\"compass-id:RNP\"),tag(\"compass-id:RPP\"),tag(\"compass-id:RSA Admin GUI\"),tag(\"compass-id:RSA Testbench GUI\"),tag(\"compass-id:RTE\"),tag(\"compass-id:RTS\"),tag(\"compass-id:RVC\"),tag(\"compass-id:RVE\"),tag(\"compass-id:RVI\"),tag(\"compass-id:RVS\"),tag(\"compass-id:RVT\"),tag(\"compass-id:rwd\"),tag(\"compass-id:tdp\"),tag(\"compass-id:uvm\"),tag(\"compass-id:vjm\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_Teleservices.tf b/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
index 6fedd6c..0cda2c4 100644
--- a/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\"),tag(\"compass-id:PDMUpdater\"),tag(\"compass-id:ts-ena-ui\"),tag(\"compass-id:WLManager\"),tag(\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\"),tag(\"compass-id:CAS-SPM\"),tag(\"compass-id:CAS-STM\"),tag(\"compass-id:DiagService\"),tag(\"compass-id:ESHAD\"),tag(\"compass-id:patchcampaign\"),tag(\"compass-id:RTCAD\"),tag(\"compass-id:RTCHandler\"),tag(\"compass-id:RTCService\"),tag(\"compass-id:ts-bcallhandler\"),tag(\"compass-id:ts-cts-ui\"),tag(\"compass-id:ts-pat-ui\"),tag(\"compass-id:TSRD\"),tag(\"compass-id:ts-rtc-ui\")" 
+    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\"),tag(\"compass-id:SCallService\"),tag(\"compass-id:SEAM\"),tag(\"compass-id:ts-asc\"),tag(\"compass-id:TSBGService\"),tag(\"compass-id:TSBM\"),tag(\"compass-id:TS-CCM-DI\"),tag(\"compass-id:TSCS\"),tag(\"compass-id:TSDD\"),tag(\"compass-id:TSMR\"),tag(\"compass-id:TS-PFFS\"),tag(\"compass-id:TSSB-BT\"),tag(\"compass-id:TSSB-BTI\"),tag(\"compass-id:TSSB-TSP\"),tag(\"compass-id:TS-SDI\"),tag(\"compass-id:ts-tyredi\"),tag(\"compass-id:ts-tyrewf\"),tag(\"compass-id:TTBS\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index ca9a645..fbf9304 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\"),tag(\"compass-id:TSMB\"),tag(\"compass-id:TSR-CH\"),tag(\"compass-id:TSR-CMA\"),tag(\"compass-id:TSR-DD\"),tag(\"compass-id:TSR-ICC\"),tag(\"compass-id:TSR-VU\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\"),tag(\"compass-id:TOL MGU\"),tag(\"compass-id:TOL-TSSB\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\"),tag(\"compass-id:ERDCDC2FCD\"),tag(\"compass-id:ERDDISP\"),tag(\"compass-id:ERDFCDUDS\"),tag(\"compass-id:ERDMGR\"),tag(\"compass-id:ERDPROC\"),tag(\"compass-id:ERDXFCDFCD\"),tag(\"compass-id:XFCD Cockpit\"),tag(\"compass-id:XFCD Configuration\"),tag(\"compass-id:XFCDAnonymizer\")" 
+    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:IDS-SVDS\"),tag(\"compass-id:IDS-Sync\"),tag(\"compass-id:IDS-WS\")" 
+    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\"),tag(\"compass-id:CSI\"),tag(\"compass-id:CSU\"),tag(\"compass-id:LSCFSU\"),tag(\"compass-id:LSCHR\"),tag(\"compass-id:LSCJHWO\"),tag(\"compass-id:LSCJR\"),tag(\"compass-id:LSCKC\"),tag(\"compass-id:LSCMM\"),tag(\"compass-id:LSCOC\"),tag(\"compass-id:LSCOG\"),tag(\"compass-id:LSCWO\"),tag(\"compass-id:tripCollection\"),tag(\"compass-id:vdc-vcs\"),tag(\"compass-id:VHCJR\"),tag(\"compass-id:VHS\"),tag(\"compass-id:VJDS\"),tag(\"compass-id:VNS\"),tag(\"compass-id:VS-API\"),tag(\"compass-id:VSFO\"),tag(\"compass-id:VSST\")" 
+    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\")" 
   }
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 67ad968..7e2d8ed 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-ADC\"),tag(\"compass-id:B2V-ADC-CLOUD\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\"),tag(\"compass-id:UDS\"),tag(\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\"),tag(\"compass-id:B2V-COM-ECHO\"),tag(\"compass-id:B2V-COM-FE\"),tag(\"compass-id:B2VCOMGCDMCLIENT\"),tag(\"compass-id:B2V-NOTS\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index b386d93..30a55d9 100644
--- a/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\"),tag(\"compass-id:AM-CASA\"),tag(\"compass-id:am-cloud\"),tag(\"compass-id:AM-CNR\"),tag(\"compass-id:AM-CNS\"),tag(\"compass-id:AM-ECS\"),tag(\"compass-id:AM-LMCS\"),tag(\"compass-id:AM-Proxy\"),tag(\"compass-id:AM-Store\"),tag(\"compass-id:AM-SVMS\"),tag(\"compass-id:AM-SVMS-EventService\"),tag(\"compass-id:AM-USAGE\"),tag(\"compass-id:AM-VAS\"),tag(\"compass-id:AM-Vehicle\"),tag(\"compass-id:AM-VMS\"),tag(\"compass-id:Countly\"),tag(\"compass-id:TAMSArchive\"),tag(\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\"),tag(\"compass-id:AM-Device\"),tag(\"compass-id:AM-EGIM\"),tag(\"compass-id:AM-MNO-Manager\"),tag(\"compass-id:CESIM Proxy\"),tag(\"compass-id:MNOMGR-CU-Jasper\"),tag(\"compass-id:MNOMGR-CU-SHA\"),tag(\"compass-id:MNOMGR-GD\"),tag(\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index c6bdced..ef5433c 100644
--- a/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -2,26 +2,26 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\"),tag(\"compass-id:ASBC-SBB\"),tag(\"compass-id:ASBCSWLSEC2\"),tag(\"compass-id:PSdZ-Checker\"),tag(\"compass-id:SCB\"),tag(\"compass-id:SCC\"),tag(\"compass-id:SWAG\"),tag(\"compass-id:SWLSEC2-Checker\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\"),tag(\"compass-id:ASBC-AFWSFA-POC\"),tag(\"compass-id:ASBC-AFWSTM-POC\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\"),tag(\"compass-id:CAC\"),tag(\"compass-id:CAC-AGENT\"),tag(\"compass-id:SMC2-BL\"),tag(\"compass-id:SMC2-KEY-TRK\"),tag(\"compass-id:SMC2-RT\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\"),tag(\"compass-id:DFPH\"),tag(\"compass-id:OCLISc2v\"),tag(\"compass-id:OCLISocsp\"),tag(\"compass-id:P2X\")" 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\"),tag(\"compass-id:STM\"),tag(\"compass-id:ts-wlupdater\"),tag(\"compass-id:TVP\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\"),tag(\"compass-id:ASBC-NGTP\"),tag(\"compass-id:ASBS\"),tag(\"compass-id:HPAuth\"),tag(\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_CallServices.tf b/NA_PROD/PD_management_zone/PD_CallServices.tf
index 83507ac..1cd73b9 100644
--- a/NA_PROD/PD_management_zone/PD_CallServices.tf
+++ b/NA_PROD/PD_management_zone/PD_CallServices.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\"),tag(\"compass-id:CRS\"),tag(\"compass-id:CRSA\"),tag(\"compass-id:EPL\"),tag(\"compass-id:EPM\"),tag(\"compass-id:VOICEGW\"),tag(\"compass-id:VOICEGW-ADMIN\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\"),tag(\"compass-id:PISA-EVENT-HANDLER\"),tag(\"compass-id:PISA-RUNTIME\")" 
+    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\"),tag(\"compass-id:CCC\"),tag(\"compass-id:RSA\"),tag(\"compass-id:RSA-ASD-Search\")" 
+    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\"),tag(\"compass-id:APPCALL\"),tag(\"compass-id:B2V-NGTP\"),tag(\"compass-id:ECALLGW\"),tag(\"compass-id:ECS\"),tag(\"compass-id:EVNS2\"),tag(\"compass-id:EVNS2T\"),tag(\"compass-id:NGTP-CS\"),tag(\"compass-id:XCS\")" 
+    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(Service),tag(\"compass-id:HTTS\"),tag(\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 5855ca8..22c52ea 100644
--- a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
   entity_selector_based_rule {
     # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\"),tag(\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
+    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -10,7 +10,7 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   }
   entity_selector_based_rule {
     # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\"),tag(\"compass-id:DPP\"),tag(\"compass-id:PERSEUS\"),tag(\"compass-id:PIABO\"),tag(\"compass-id:PIAEP\"),tag(\"compass-id:PIAOP\"),tag(\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
   }
   rules {
     type = "SERVICE" 
diff --git a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index d948e70..82cf6aa 100644
--- a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ambient-music\"),tag(\"compass-id:festive-mode\")" 
+    selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\"),tag(\"compass-id:Geolocator\"),tag(\"compass-id:intelligent-reminder\"),tag(\"compass-id:news-next\"),tag(\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
@@ -14,10 +14,10 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\"),tag(\"compass-id:ID5\"),tag(\"compass-id:ID5-APP\"),tag(\"compass-id:ID5-EXT\"),tag(\"compass-id:ISE-BEV\"),tag(\"compass-id:ISE-CDR\"),tag(\"compass-id:ISE-EML\"),tag(\"compass-id:ISE-GEN2\"),tag(\"compass-id:ISE-ID7\"),tag(\"compass-id:ISE-INP\"),tag(\"compass-id:ISE-IPA\"),tag(\"compass-id:ISE-LIS\"),tag(\"compass-id:ISE-LOC\"),tag(\"compass-id:ISE-MCL\"),tag(\"compass-id:ISE-NEWS\"),tag(\"compass-id:ISE-PAR\"),tag(\"compass-id:ISE-RSL\"),tag(\"compass-id:ISE-VPS\"),tag(\"compass-id:ISE-VSD\"),tag(\"compass-id:tmpp-admin-ui\"),tag(\"compass-id:tmpp-manifest\"),tag(\"compass-id:tmpp-web-proxy\"),tag(\"compass-id:UPS\"),tag(\"compass-id:WEA\"),tag(\"compass-id:WEA-ID5\"),tag(\"compass-id:WEA-IN-MAP\")" 
+    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\"),tag(\"compass-id:cm-gracenote\"),tag(\"compass-id:cm-spotify\"),tag(\"compass-id:cm-ximalaya\"),tag(\"compass-id:OED\"),tag(\"compass-id:OED-CN\"),tag(\"compass-id:OEG\"),tag(\"compass-id:OEG-CN\"),tag(\"compass-id:OEO\"),tag(\"compass-id:OEO-CN\"),tag(\"compass-id:OEP\"),tag(\"compass-id:OEP-CN\"),tag(\"compass-id:OES\"),tag(\"compass-id:OES-CN\"),tag(\"compass-id:OET\"),tag(\"compass-id:OET-CN\"),tag(\"compass-id:shortvideo\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_LocationServices.tf b/NA_PROD/PD_management_zone/PD_LocationServices.tf
index 0027a4a..1d90274 100644
--- a/NA_PROD/PD_management_zone/PD_LocationServices.tf
+++ b/NA_PROD/PD_management_zone/PD_LocationServices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ercaf\"),tag(\"compass-id:ERCR\"),tag(\"compass-id:ERTP\")" 
+    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\"),tag(\"compass-id:potholes-reader\"),tag(\"compass-id:potholes-service\"),tag(\"compass-id:sc-reader\"),tag(\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"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\"),tag(\"compass-id:GCS\"),tag(\"compass-id:LOS-CHA\"),tag(\"compass-id:LOS-CHA-CNV\"),tag(\"compass-id:LOS-JOY\"),tag(\"compass-id:LOS-MOD\"),tag(\"compass-id:LOS-MSC\"),tag(\"compass-id:LOS-OPS\"),tag(\"compass-id:LOS-PAR\"),tag(\"compass-id:LOS-PER\"),tag(\"compass-id:LOS-REF\"),tag(\"compass-id:RES-PAR\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf b/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
index 10cf285..728c428 100644
--- a/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
+++ b/NA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\"),tag(\"compass-id:ms-hdmap-map-viewer\"),tag(\"compass-id:ms-hdmap-mci-adapter\"),tag(\"compass-id:ms-hdmap-mci-downloader\"),tag(\"compass-id:ms-hdmap-nds-downloader\"),tag(\"compass-id:ms-hdmap-qc-bl\"),tag(\"compass-id:ms-hdmap-qc-checks\"),tag(\"compass-id:ms-hdmap-tile-delivery\"),tag(\"compass-id:ms-hdmap-tile-generator\"),tag(\"compass-id:ms-hdmap-vehicle-mock\"),tag(\"compass-id:mupi-backend\"),tag(\"compass-id:MUPI-BE\"),tag(\"compass-id:mupi-cloud-discovery-service\"),tag(\"compass-id:mupi-cloud-dumm-adapter-service\"),tag(\"compass-id:mupi-cloud-hd-adapter-service\"),tag(\"compass-id:mupi-cloud-import-service\"),tag(\"compass-id:mupi-cloud-integration-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-class-service\"),tag(\"compass-id:mupi-cloud-joynr-adapter-service\"),tag(\"compass-id:mupi-cloud-stats-service\"),tag(\"compass-id:mupi-cockpit\"),tag(\"compass-id:mupi-gateway\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\"),tag(\"compass-id:gnss-reader\"),tag(\"compass-id:gnss-service\"),tag(\"compass-id:ms-3dp-rc\"),tag(\"compass-id:tc-app\"),tag(\"compass-id:tc-service\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_NavigationServices.tf b/NA_PROD/PD_management_zone/PD_NavigationServices.tf
index a820f67..3388d86 100644
--- a/NA_PROD/PD_management_zone/PD_NavigationServices.tf
+++ b/NA_PROD/PD_management_zone/PD_NavigationServices.tf
@@ -6,10 +6,10 @@ resource "dynatrace_management_zone" "PD_NavigationServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\"),tag(\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\"),tag(\"compass-id:eRoute\"),tag(\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf b/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
index b1abfe4..d8459ff 100644
--- a/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
+++ b/NA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf
@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\"),tag(\"compass-id:FMC\"),tag(\"compass-id:RS\"),tag(\"compass-id:RS360\"),tag(\"compass-id:RSCockpit\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\"),tag(\"compass-id:ICNB\"),tag(\"compass-id:MSGSVC\"),tag(\"compass-id:OMGW\"),tag(\"compass-id:TCN\"),tag(\"compass-id:XCC-CAMPAIGNS\"),tag(\"compass-id:XCC-CMGR\"),tag(\"compass-id:XCC-SETTINGS\"),tag(\"compass-id:XCC-STATISTICS\"),tag(\"compass-id:XCC-USERS\")" 
+    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\")" 
   }
   rules {
     type = "MOBILE_APPLICATION" 
diff --git a/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf b/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
index bcf59a9..190dff6 100644
--- a/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
+++ b/NA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SFA-FRE\"),tag(\"compass-id:SFA-OH\"),tag(\"compass-id:SFA-OTA\"),tag(\"compass-id:SFA-S\"),tag(\"compass-id:SFA-TS\")" 
+    selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\"),tag(\"compass-id:comfy-cockpit\"),tag(\"compass-id:comfy-management\"),tag(\"compass-id:comfy-orchestration\"),tag(\"compass-id:NOP-Admin\"),tag(\"compass-id:NOP-Archive\"),tag(\"compass-id:NOP-Provisioning\"),tag(\"compass-id:NOP-Trigger\"),tag(\"compass-id:SCM\"),tag(\"compass-id:SCMA\"),tag(\"compass-id:VPS-Admin\"),tag(\"compass-id:VPS-Archive\"),tag(\"compass-id:VPS-Monitor\"),tag(\"compass-id:VPS-Prov\"),tag(\"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\",\"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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:APR\"),tag(\"compass-id:APR-NPM\"),tag(\"compass-id:APR-Portal\"),tag(\"compass-id:APR-Registry\")" 
+    selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\"),tag(\"compass-id:ZDI\"),tag(\"compass-id:ZFUS-MP-GENERATOR\"),tag(\"compass-id:ZIP\"),tag(\"compass-id:zis\"),tag(\"compass-id:ZMP\"),tag(\"compass-id:ZOS\")" 
+    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\"),tag(\"compass-id:FRS\"),tag(\"compass-id:MPG\"),tag(\"compass-id:QMC\"),tag(\"compass-id:RCM\"),tag(\"compass-id:RCP\"),tag(\"compass-id:RCS\"),tag(\"compass-id:RDC\"),tag(\"compass-id:RDH\"),tag(\"compass-id:RES\"),tag(\"compass-id:RLM\"),tag(\"compass-id:RMO\"),tag(\"compass-id:RNB App\"),tag(\"compass-id:RNP\"),tag(\"compass-id:RPP\"),tag(\"compass-id:RSA Admin GUI\"),tag(\"compass-id:RSA Testbench GUI\"),tag(\"compass-id:RTE\"),tag(\"compass-id:RTS\"),tag(\"compass-id:RVC\"),tag(\"compass-id:RVE\"),tag(\"compass-id:RVI\"),tag(\"compass-id:RVS\"),tag(\"compass-id:RVT\"),tag(\"compass-id:rwd\"),tag(\"compass-id:tdp\"),tag(\"compass-id:uvm\"),tag(\"compass-id:vjm\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_Teleservices.tf b/NA_PROD/PD_management_zone/PD_Teleservices.tf
index 6fedd6c..0cda2c4 100644
--- a/NA_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/NA_PROD/PD_management_zone/PD_Teleservices.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\"),tag(\"compass-id:PDMUpdater\"),tag(\"compass-id:ts-ena-ui\"),tag(\"compass-id:WLManager\"),tag(\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\"),tag(\"compass-id:CAS-SPM\"),tag(\"compass-id:CAS-STM\"),tag(\"compass-id:DiagService\"),tag(\"compass-id:ESHAD\"),tag(\"compass-id:patchcampaign\"),tag(\"compass-id:RTCAD\"),tag(\"compass-id:RTCHandler\"),tag(\"compass-id:RTCService\"),tag(\"compass-id:ts-bcallhandler\"),tag(\"compass-id:ts-cts-ui\"),tag(\"compass-id:ts-pat-ui\"),tag(\"compass-id:TSRD\"),tag(\"compass-id:ts-rtc-ui\")" 
+    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\"),tag(\"compass-id:SCallService\"),tag(\"compass-id:SEAM\"),tag(\"compass-id:ts-asc\"),tag(\"compass-id:TSBGService\"),tag(\"compass-id:TSBM\"),tag(\"compass-id:TS-CCM-DI\"),tag(\"compass-id:TSCS\"),tag(\"compass-id:TSDD\"),tag(\"compass-id:TSMR\"),tag(\"compass-id:TS-PFFS\"),tag(\"compass-id:TSSB-BT\"),tag(\"compass-id:TSSB-BTI\"),tag(\"compass-id:TSSB-TSP\"),tag(\"compass-id:TS-SDI\"),tag(\"compass-id:ts-tyredi\"),tag(\"compass-id:ts-tyrewf\"),tag(\"compass-id:TTBS\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index ca9a645..fbf9304 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -2,22 +2,22 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\"),tag(\"compass-id:TSMB\"),tag(\"compass-id:TSR-CH\"),tag(\"compass-id:TSR-CMA\"),tag(\"compass-id:TSR-DD\"),tag(\"compass-id:TSR-ICC\"),tag(\"compass-id:TSR-VU\")" 
+    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\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\"),tag(\"compass-id:TOL MGU\"),tag(\"compass-id:TOL-TSSB\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\"),tag(\"compass-id:ERDCDC2FCD\"),tag(\"compass-id:ERDDISP\"),tag(\"compass-id:ERDFCDUDS\"),tag(\"compass-id:ERDMGR\"),tag(\"compass-id:ERDPROC\"),tag(\"compass-id:ERDXFCDFCD\"),tag(\"compass-id:XFCD Cockpit\"),tag(\"compass-id:XFCD Configuration\"),tag(\"compass-id:XFCDAnonymizer\")" 
+    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:IDS-SVDS\"),tag(\"compass-id:IDS-Sync\"),tag(\"compass-id:IDS-WS\")" 
+    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\"),tag(\"compass-id:CSI\"),tag(\"compass-id:CSU\"),tag(\"compass-id:LSCFSU\"),tag(\"compass-id:LSCHR\"),tag(\"compass-id:LSCJHWO\"),tag(\"compass-id:LSCJR\"),tag(\"compass-id:LSCKC\"),tag(\"compass-id:LSCMM\"),tag(\"compass-id:LSCOC\"),tag(\"compass-id:LSCOG\"),tag(\"compass-id:LSCWO\"),tag(\"compass-id:tripCollection\"),tag(\"compass-id:vdc-vcs\"),tag(\"compass-id:VHCJR\"),tag(\"compass-id:VHS\"),tag(\"compass-id:VJDS\"),tag(\"compass-id:VNS\"),tag(\"compass-id:VS-API\"),tag(\"compass-id:VSFO\"),tag(\"compass-id:VSST\")" 
+    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\")" 
   }
 }
diff --git a/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 67ad968..7e2d8ed 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-ADC\"),tag(\"compass-id:B2V-ADC-CLOUD\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\"),tag(\"compass-id:UDS\"),tag(\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\"),tag(\"compass-id:B2V-COM-ECHO\"),tag(\"compass-id:B2V-COM-FE\"),tag(\"compass-id:B2VCOMGCDMCLIENT\"),tag(\"compass-id:B2V-NOTS\")" 
+    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\")" 
   }
 }