diff --git a/CN_PREPROD/PD_management_zone/PD_Teleservices.tf b/CN_PREPROD/PD_management_zone/PD_Teleservices.tf
index 40b92be..6074464 100644
--- a/CN_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -14,7 +14,7 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
   }
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
diff --git a/CN_PROD/PD_management_zone/PD_Teleservices.tf b/CN_PROD/PD_management_zone/PD_Teleservices.tf
index 40b92be..6074464 100644
--- a/CN_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/CN_PROD/PD_management_zone/PD_Teleservices.tf
@@ -14,7 +14,7 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
   }
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
diff --git a/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf b/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
index 40b92be..6074464 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -14,7 +14,7 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
   }
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
diff --git a/EMEA_PROD/PD_management_zone/PD_Teleservices.tf b/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
index 40b92be..6074464 100644
--- a/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_Teleservices.tf
@@ -14,7 +14,7 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
   }
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
diff --git a/NA_PREPROD/PD_management_zone/PD_Teleservices.tf b/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
index 40b92be..6074464 100644
--- a/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_Teleservices.tf
@@ -14,7 +14,7 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
   }
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {
diff --git a/NA_PROD/PD_management_zone/PD_Teleservices.tf b/NA_PROD/PD_management_zone/PD_Teleservices.tf
index 40b92be..6074464 100644
--- a/NA_PROD/PD_management_zone/PD_Teleservices.tf
+++ b/NA_PROD/PD_management_zone/PD_Teleservices.tf
@@ -14,7 +14,7 @@ resource "dynatrace_management_zone" "PD_Teleservices" {
   // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
   }
   // for wrongly tagged services we still keep:
   entity_selector_based_rule {