diff --git a/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 945aacc..39d7d46 100644
--- a/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -25,12 +25,12 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:eCSM\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\",\"compass-id:UIS\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
   }
 
 }
diff --git a/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 945aacc..39d7d46 100644
--- a/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -25,12 +25,12 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:eCSM\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\",\"compass-id:UIS\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
   }
 
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 945aacc..39d7d46 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -25,12 +25,12 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:eCSM\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\",\"compass-id:UIS\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
   }
 
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 945aacc..39d7d46 100644
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -25,12 +25,12 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:eCSM\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\",\"compass-id:UIS\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
   }
 
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 945aacc..39d7d46 100644
--- a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -25,12 +25,12 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:eCSM\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\",\"compass-id:UIS\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
   }
 
 }
diff --git a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
index 945aacc..39d7d46 100644
--- a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@@ -25,12 +25,12 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:eCSM\")" 
+    selector = "type(PROCESS_GROUP),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\",\"compass-id:UIS\")" 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
   }
 
 }