diff --git a/EMEA_PROD/management_zone/cd_am-svms.tf b/EMEA_PROD/management_zone/cd_am-svms.tf
index f86fb1fd..99ca12aa 100644
--- a/EMEA_PROD/management_zone/cd_am-svms.tf
+++ b/EMEA_PROD/management_zone/cd_am-svms.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-svms.id = 3535580551222857233
 resource "dynatrace_management_zone" "CD_am-svms" {
   name = "CD_am-svms"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-svms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-svms\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-svms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-svms\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true
diff --git a/NA_PROD/management_zone/cd_am-svms.tf b/NA_PROD/management_zone/cd_am-svms.tf
index 651b8835..97bb5feb 100644
--- a/NA_PROD/management_zone/cd_am-svms.tf
+++ b/NA_PROD/management_zone/cd_am-svms.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-svms.id = 7784990349849084247
 resource "dynatrace_management_zone" "CD_am-svms" {
   name = "CD_am-svms"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-svms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-svms\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-svms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-svms\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true