diff --git a/CN_PREPROD/management_zone/cd_vdm_sfa.tf b/CN_PREPROD/management_zone/cd_vdm_sfa.tf
index d9d27dfa..b87688d6 100644
--- a/CN_PREPROD/management_zone/cd_vdm_sfa.tf
+++ b/CN_PREPROD/management_zone/cd_vdm_sfa.tf
@@ -4,25 +4,25 @@ resource "dynatrace_management_zone" "CD_vdm_sfa" {
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS"))
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(HOST),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(HOST),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(Service),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(Service),tag("Namespace:sfa")
     EOT
   }
 }
diff --git a/CN_PROD/management_zone/cd_vdm_sfa.tf b/CN_PROD/management_zone/cd_vdm_sfa.tf
index 7c811f06..bab68123 100644
--- a/CN_PROD/management_zone/cd_vdm_sfa.tf
+++ b/CN_PROD/management_zone/cd_vdm_sfa.tf
@@ -4,25 +4,25 @@ resource "dynatrace_management_zone" "CD_vdm_sfa" {
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS"))
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(HOST),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(HOST),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(Service),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(Service),tag("Namespace:sfa")
     EOT
   }
 }
diff --git a/EMEA_PREPROD/management_zone/cd_vdm_sfa.tf b/EMEA_PREPROD/management_zone/cd_vdm_sfa.tf
index 889a6224..9d83a914 100644
--- a/EMEA_PREPROD/management_zone/cd_vdm_sfa.tf
+++ b/EMEA_PREPROD/management_zone/cd_vdm_sfa.tf
@@ -4,25 +4,25 @@ resource "dynatrace_management_zone" "CD_vdm_sfa" {
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS"))
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(HOST),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(HOST),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(Service),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(Service),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
     EOT
   }
 }
diff --git a/EMEA_PROD/management_zone/cd_vdm_sfa.tf b/EMEA_PROD/management_zone/cd_vdm_sfa.tf
index 8dd67634..51c186ef 100644
--- a/EMEA_PROD/management_zone/cd_vdm_sfa.tf
+++ b/EMEA_PROD/management_zone/cd_vdm_sfa.tf
@@ -4,25 +4,25 @@ resource "dynatrace_management_zone" "CD_vdm_sfa" {
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS"))
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(HOST),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(HOST),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(Service),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(Service),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
     EOT
   }
 }
diff --git a/NA_PREPROD/management_zone/cd_vdm_sfa.tf b/NA_PREPROD/management_zone/cd_vdm_sfa.tf
index e09bc897..01882578 100644
--- a/NA_PREPROD/management_zone/cd_vdm_sfa.tf
+++ b/NA_PREPROD/management_zone/cd_vdm_sfa.tf
@@ -4,25 +4,25 @@ resource "dynatrace_management_zone" "CD_vdm_sfa" {
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS"))
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(HOST),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(HOST),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(Service),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(Service),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
     EOT
   }
 }
diff --git a/NA_PROD/management_zone/cd_vdm_sfa.tf b/NA_PROD/management_zone/cd_vdm_sfa.tf
index d6974813..18fbf0c9 100644
--- a/NA_PROD/management_zone/cd_vdm_sfa.tf
+++ b/NA_PROD/management_zone/cd_vdm_sfa.tf
@@ -4,25 +4,25 @@ resource "dynatrace_management_zone" "CD_vdm_sfa" {
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS"))
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(HOST),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(HOST),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(Service),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(Service),tag("Namespace:sfa")
     EOT
   }
   entity_selector_based_rule {
     enabled  = true
     selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("compass-id:SFA-S","compass-id:SFA-OH","compass-id:SFA-FRE","compass-id:SFA-FC","compass-id:SFA-RFS")
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
     EOT
   }
 }