diff --git a/CN_PROD/management_zone/cd_am-vms.tf b/CN_PROD/management_zone/cd_am-vms.tf
index d9d78118..3b59b827 100644
--- a/CN_PROD/management_zone/cd_am-vms.tf
+++ b/CN_PROD/management_zone/cd_am-vms.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-vms.id = 4100149489132500029
 resource "dynatrace_management_zone" "CD_am-vms" {
   name = "CD_am-vms"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-vms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-vms\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-vms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-vms\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true
@@ -46,7 +62,7 @@ resource "dynatrace_management_zone" "CD_am-vms" {
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "am-vms"
         }
       }
@@ -66,7 +82,7 @@ resource "dynatrace_management_zone" "CD_am-vms" {
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "am-vms"
         }
       }
@@ -86,7 +102,7 @@ resource "dynatrace_management_zone" "CD_am-vms" {
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "am-vms"
         }
       }
diff --git a/EMEA_PROD/management_zone/cd_am-vms.tf b/EMEA_PROD/management_zone/cd_am-vms.tf
index d0fd29ff..fb6d6b69 100644
--- a/EMEA_PROD/management_zone/cd_am-vms.tf
+++ b/EMEA_PROD/management_zone/cd_am-vms.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-vms.id = 8481305279283217918
 resource "dynatrace_management_zone" "CD_am-vms" {
   name = "CD_am-vms"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-vms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-vms\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-vms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-vms\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true
diff --git a/NA_PROD/management_zone/cd_am-vms.tf b/NA_PROD/management_zone/cd_am-vms.tf
index 851301f5..91b2b868 100644
--- a/NA_PROD/management_zone/cd_am-vms.tf
+++ b/NA_PROD/management_zone/cd_am-vms.tf
@@ -1,6 +1,22 @@
 # DEFINE dynatrace_management_zone.CD_am-vms.id = -3540603907163489246
 resource "dynatrace_management_zone" "CD_am-vms" {
   name = "CD_am-vms"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:am-vms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:am-vms\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:am-vms\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:am-vms\")"
+  }
   rules {
     type    = "CLOUD_APPLICATION"
     enabled = true