diff --git a/EMEA_PROD/management_zone/cd_am-cns.tf b/EMEA_PROD/management_zone/cd_am-cns.tf
index b9eb980e..1793bc64 100644
--- a/EMEA_PROD/management_zone/cd_am-cns.tf
+++ b/EMEA_PROD/management_zone/cd_am-cns.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-cns.id = 2845183407633390643
 resource "dynatrace_management_zone" "CD_am-cns" {
   name = "CD_am-cns"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-cns\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-cns\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-cns\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-cns\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true
diff --git a/NA_PROD/management_zone/cd_am-cns.tf b/NA_PROD/management_zone/cd_am-cns.tf
index aa96ba1a..22a9f42b 100644
--- a/NA_PROD/management_zone/cd_am-cns.tf
+++ b/NA_PROD/management_zone/cd_am-cns.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-cns.id = -499021351677048016
 resource "dynatrace_management_zone" "CD_am-cns" {
   name = "CD_am-cns"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-cns\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-cns\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-cns\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-cns\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true