diff --git a/CN_PROD/management_zone/cd_connected-oauth-service.tf b/CN_PROD/management_zone/cd_connected-oauth-service.tf
index 54042a92..fefb62c2 100644
--- a/CN_PROD/management_zone/cd_connected-oauth-service.tf
+++ b/CN_PROD/management_zone/cd_connected-oauth-service.tf
@@ -1,20 +1,95 @@
-# DEFINE dynatrace_management_zone.CD_mobile_login = -340771320666888764
-resource "dynatrace_management_zone" "CD_mobile_login" {
-  name = "CD_mobile_login"
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:cn-connected-oauth-service\")"
+# DEFINE dynatrace_management_zone.CD_connected-oauth-service.id = -340771320666888764
+resource "dynatrace_management_zone" "CD_connected-oauth-service" {
+  name = "CD_connected-oauth-service"
+  rules {
+    type    = "CLOUD_APPLICATION"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "connected-oauth-service"
+      }
+    }
   }
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(HOST),tag(\"compass-id:cn-connected-oauth-service\")"
+  rules {
+    type    = "CLOUD_APPLICATION_NAMESPACE"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "connected-oauth-service"
+      }
+    }
   }
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(Service),tag(\"compass-id:cn-connected-oauth-service\")"
+  rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "connected-oauth-service"
+        }
+      }
+    }
   }
-  entity_selector_based_rule {
-    enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:cn-connected-oauth-service\"))"
+  rules {
+    type              = "PROCESS_GROUP"
+    enabled           = true
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "connected-oauth-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    enabled           = true
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "connected-oauth-service"
+        }
+      }
+    }
   }
 }