diff --git a/CN_PREPROD/alerting/cd_scc_int.tf b/CN_PREPROD/alerting/cd_scc_int.tf
index ef5b9f2f..61ed0450 100644
--- a/CN_PREPROD/alerting/cd_scc_int.tf
+++ b/CN_PREPROD/alerting/cd_scc_int.tf
@@ -8,31 +8,31 @@ resource "dynatrace_alerting" "CD_scc_INT" {
       delay_in_minutes = 0
       include_mode     = "INCLUDE_ALL"
       severity_level   = "AVAILABILITY"
-      tags             = [ "Environment:INT", "Component:scc" ]
+      tags             = [ "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Environment:INT", "Component:scc" ]
+      tags             = [ "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "ERRORS"
-      tags             = [ "Environment:INT", "Component:scc" ]
+      tags             = [ "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "PERFORMANCE"
-      tags             = [ "Environment:INT", "Component:scc" ]
+      tags             = [ "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Environment:INT", "Component:scc" ]
+      tags             = [ "Environment:INT" ]
     }
   }
 }
\ No newline at end of file
diff --git a/CN_PREPROD/dashboard/cd_scc_int-test.tf b/CN_PREPROD/dashboard/cd_scc_int-test.tf
index a1fa9287..4f74455c 100644
--- a/CN_PREPROD/dashboard/cd_scc_int-test.tf
+++ b/CN_PREPROD/dashboard/cd_scc_int-test.tf
@@ -103,7 +103,7 @@ resource "dynatrace_dashboard" "CD_scc_INT-TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -418,7 +418,7 @@ resource "dynatrace_dashboard" "CD_scc_INT-TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -459,7 +459,7 @@ resource "dynatrace_dashboard" "CD_scc_INT-TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -489,7 +489,7 @@ resource "dynatrace_dashboard" "CD_scc_INT-TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -519,7 +519,7 @@ resource "dynatrace_dashboard" "CD_scc_INT-TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -549,7 +549,7 @@ resource "dynatrace_dashboard" "CD_scc_INT-TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
diff --git a/CN_PREPROD/dashboard/cd_scc_int.tf b/CN_PREPROD/dashboard/cd_scc_int.tf
index a8fe1fc3..f3cf9d7d 100644
--- a/CN_PREPROD/dashboard/cd_scc_int.tf
+++ b/CN_PREPROD/dashboard/cd_scc_int.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
diff --git a/CN_PREPROD/dashboard/cd_scc_test.tf b/CN_PREPROD/dashboard/cd_scc_test.tf
index f3f89cd1..31e2fe01 100644
--- a/CN_PREPROD/dashboard/cd_scc_test.tf
+++ b/CN_PREPROD/dashboard/cd_scc_test.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
diff --git a/CN_PREPROD/management_zone/cd_scc.tf b/CN_PREPROD/management_zone/cd_scc.tf
index bbc369a7..59944e2e 100644
--- a/CN_PREPROD/management_zone/cd_scc.tf
+++ b/CN_PREPROD/management_zone/cd_scc.tf
@@ -51,6 +51,25 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "PROCESS_GROUP"
@@ -71,6 +90,26 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "SERVICE"
@@ -92,4 +131,24 @@ resource "dynatrace_management_zone" "CD_scc" {
       }
     }
   }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
+  }
 }
diff --git a/CN_PROD/alerting/cd_scc_prod.tf b/CN_PROD/alerting/cd_scc_prod.tf
index 509514ee..e9033913 100644
--- a/CN_PROD/alerting/cd_scc_prod.tf
+++ b/CN_PROD/alerting/cd_scc_prod.tf
@@ -8,31 +8,31 @@ resource "dynatrace_alerting" "CD_scc_PROD" {
       delay_in_minutes = 0
       include_mode     = "INCLUDE_ALL"
       severity_level   = "AVAILABILITY"
-      tags             = [ "Environment:PROD", "Component:scc" ]
+      tags             = [ "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Environment:PROD", "Component:scc" ]
+      tags             = [ "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "ERRORS"
-      tags             = [ "Environment:PROD", "Component:scc" ]
+      tags             = [ "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "PERFORMANCE"
-      tags             = [ "Environment:PROD", "Component:scc" ]
+      tags             = [ "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Environment:PROD", "Component:scc" ]
+      tags             = [ "Environment:PROD" ]
     }
   }
 }
\ No newline at end of file
diff --git a/CN_PROD/dashboard/cd_scc_e2e.tf b/CN_PROD/dashboard/cd_scc_e2e.tf
index 485e7bd8..f984ba72 100644
--- a/CN_PROD/dashboard/cd_scc_e2e.tf
+++ b/CN_PROD/dashboard/cd_scc_e2e.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
diff --git a/CN_PROD/dashboard/cd_scc_prod.tf b/CN_PROD/dashboard/cd_scc_prod.tf
index 1edad7f0..b74bf1e3 100644
--- a/CN_PROD/dashboard/cd_scc_prod.tf
+++ b/CN_PROD/dashboard/cd_scc_prod.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
diff --git a/CN_PROD/management_zone/cd_scc.tf b/CN_PROD/management_zone/cd_scc.tf
index 38e740c9..c3204bee 100644
--- a/CN_PROD/management_zone/cd_scc.tf
+++ b/CN_PROD/management_zone/cd_scc.tf
@@ -51,6 +51,25 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "PROCESS_GROUP"
@@ -71,6 +90,26 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "SERVICE"
@@ -92,4 +131,24 @@ resource "dynatrace_management_zone" "CD_scc" {
       }
     }
   }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
+  }
 }
diff --git a/EMEA_PREPROD/management_zone/cd_scc.tf b/EMEA_PREPROD/management_zone/cd_scc.tf
index b0dcf62b..4dea0504 100644
--- a/EMEA_PREPROD/management_zone/cd_scc.tf
+++ b/EMEA_PREPROD/management_zone/cd_scc.tf
@@ -51,6 +51,25 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "PROCESS_GROUP"
@@ -71,6 +90,26 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "SERVICE"
@@ -92,4 +131,24 @@ resource "dynatrace_management_zone" "CD_scc" {
       }
     }
   }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
+  }
 }
diff --git a/EMEA_PROD/dashboard/cd_scc_e2e.tf b/EMEA_PROD/dashboard/cd_scc_e2e.tf
index f46fc8fc..d1e3731a 100644
--- a/EMEA_PROD/dashboard/cd_scc_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_scc_e2e.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
diff --git a/EMEA_PROD/dashboard/cd_scc_prod.tf b/EMEA_PROD/dashboard/cd_scc_prod.tf
index be5c9b14..165a4faf 100644
--- a/EMEA_PROD/dashboard/cd_scc_prod.tf
+++ b/EMEA_PROD/dashboard/cd_scc_prod.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
diff --git a/EMEA_PROD/management_zone/cd_scc.tf b/EMEA_PROD/management_zone/cd_scc.tf
index f6b105bb..9ef61cd1 100644
--- a/EMEA_PROD/management_zone/cd_scc.tf
+++ b/EMEA_PROD/management_zone/cd_scc.tf
@@ -51,6 +51,25 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "PROCESS_GROUP"
@@ -71,6 +90,26 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "SERVICE"
@@ -92,4 +131,24 @@ resource "dynatrace_management_zone" "CD_scc" {
       }
     }
   }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
+  }
 }
diff --git a/NA_PREPROD/dashboard/cd_scc_int.tf b/NA_PREPROD/dashboard/cd_scc_int.tf
index e8c2377f..4779933b 100644
--- a/NA_PREPROD/dashboard/cd_scc_int.tf
+++ b/NA_PREPROD/dashboard/cd_scc_int.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_scc_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:INT", "Component:scc" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
diff --git a/NA_PREPROD/dashboard/cd_scc_test.tf b/NA_PREPROD/dashboard/cd_scc_test.tf
index 34d6f444..7d44f6cd 100644
--- a/NA_PREPROD/dashboard/cd_scc_test.tf
+++ b/NA_PREPROD/dashboard/cd_scc_test.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [  "Environment:TEST" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [  "Environment:TEST" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [  "Environment:TEST" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [  "Environment:TEST" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_scc_TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:scc", "Environment:TEST" ]
+            values = [  "Environment:TEST" ]
           }
         }
       }
diff --git a/NA_PREPROD/management_zone/cd_scc.tf b/NA_PREPROD/management_zone/cd_scc.tf
index dd23496b..54d14528 100644
--- a/NA_PREPROD/management_zone/cd_scc.tf
+++ b/NA_PREPROD/management_zone/cd_scc.tf
@@ -51,6 +51,25 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "PROCESS_GROUP"
@@ -71,6 +90,26 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "SERVICE"
@@ -92,4 +131,24 @@ resource "dynatrace_management_zone" "CD_scc" {
       }
     }
   }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
+  }
 }
diff --git a/NA_PROD/dashboard/cd_scc_e2e.tf b/NA_PROD/dashboard/cd_scc_e2e.tf
index 80ec749e..4b452a4a 100644
--- a/NA_PROD/dashboard/cd_scc_e2e.tf
+++ b/NA_PROD/dashboard/cd_scc_e2e.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_scc_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:scc" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
diff --git a/NA_PROD/dashboard/cd_scc_prod.tf b/NA_PROD/dashboard/cd_scc_prod.tf
index 1fab3ac6..0aaff377 100644
--- a/NA_PROD/dashboard/cd_scc_prod.tf
+++ b/NA_PROD/dashboard/cd_scc_prod.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_scc_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:PROD", "Component:scc" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
diff --git a/NA_PROD/management_zone/cd_scc.tf b/NA_PROD/management_zone/cd_scc.tf
index 34cc1d6c..5de327dc 100644
--- a/NA_PROD/management_zone/cd_scc.tf
+++ b/NA_PROD/management_zone/cd_scc.tf
@@ -51,6 +51,25 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "PROCESS_GROUP"
@@ -71,6 +90,26 @@ resource "dynatrace_management_zone" "CD_scc" {
         }
       }
     }
+  }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
   }
   rules {
     type              = "SERVICE"
@@ -92,4 +131,24 @@ resource "dynatrace_management_zone" "CD_scc" {
       }
     }
   }
+    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     = "compass-id"
+          value   = "scc"
+        }
+      }
+    }
+  }
 }