diff --git a/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf b/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
index c9e3f46a..a7ba1a27 100644
--- a/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
+++ b/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
@@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" {
   name = "CD_ASBC-FZGSSLCA"
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))"
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))"
   }
 }
\ No newline at end of file
diff --git a/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf b/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
index c9e3f46a..a7ba1a27 100644
--- a/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
+++ b/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
@@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" {
   name = "CD_ASBC-FZGSSLCA"
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))"
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))"
   }
 }
\ No newline at end of file
diff --git a/CN_PROD/management_zone/cd_connected-oauth-service.tf b/CN_PROD/management_zone/cd_connected-oauth-service.tf
index fefb62c2..54042a92 100644
--- a/CN_PROD/management_zone/cd_connected-oauth-service.tf
+++ b/CN_PROD/management_zone/cd_connected-oauth-service.tf
@@ -1,95 +1,20 @@
-# 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"
-      }
-    }
+# 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\")"
   }
-  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(HOST),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),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"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:cn-connected-oauth-service\"))"
   }
 }
diff --git a/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf b/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
index c9e3f46a..a7ba1a27 100644
--- a/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
+++ b/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
@@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" {
   name = "CD_ASBC-FZGSSLCA"
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))"
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))"
   }
 }
\ No newline at end of file
diff --git a/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf b/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
index c9e3f46a..a7ba1a27 100644
--- a/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
+++ b/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
@@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" {
   name = "CD_ASBC-FZGSSLCA"
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))"
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))"
   }
 }
\ No newline at end of file
diff --git a/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf b/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
index c9e3f46a..a7ba1a27 100644
--- a/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
+++ b/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf
@@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" {
   name = "CD_ASBC-FZGSSLCA"
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))"
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))"
   }
 }
\ No newline at end of file
diff --git a/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf b/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
index c9e3f46a..a7ba1a27 100644
--- a/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
+++ b/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf
@@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" {
   name = "CD_ASBC-FZGSSLCA"
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")"
+    selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))"
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))"
   }
 }
\ No newline at end of file