diff --git a/EMEA_PREPROD/dashboard/cd_am-cns_int.tf b/EMEA_PREPROD/dashboard/cd_am-cns_int.tf
index a071820c..8053dd19 100644
--- a/EMEA_PREPROD/dashboard/cd_am-cns_int.tf
+++ b/EMEA_PREPROD/dashboard/cd_am-cns_int.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
     tags   = [ "CD_am-cns" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_INT.id
+      }
     }
   }
   tile {
@@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PREPROD/dashboard/cd_am-cns_test.tf b/EMEA_PREPROD/dashboard/cd_am-cns_test.tf
index 9555bf08..ca0a089d 100644
--- a/EMEA_PREPROD/dashboard/cd_am-cns_test.tf
+++ b/EMEA_PREPROD/dashboard/cd_am-cns_test.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
     tags   = [ "CD_am-cns" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_TEST.id
+      }
     }
   }
   tile {
@@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-cns_e2e.tf b/EMEA_PROD/dashboard/cd_am-cns_e2e.tf
index 450aa79d..ba918cb2 100644
--- a/EMEA_PROD/dashboard/cd_am-cns_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_am-cns_e2e.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_E2E.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-cns_prod.tf b/EMEA_PROD/dashboard/cd_am-cns_prod.tf
index cb6272d8..c47b2b09 100644
--- a/EMEA_PROD/dashboard/cd_am-cns_prod.tf
+++ b/EMEA_PROD/dashboard/cd_am-cns_prod.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_PROD.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PREPROD/dashboard/cd_am-cns_int.tf b/NA_PREPROD/dashboard/cd_am-cns_int.tf
index 09ecc1bf..723eba80 100644
--- a/NA_PREPROD/dashboard/cd_am-cns_int.tf
+++ b/NA_PREPROD/dashboard/cd_am-cns_int.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
     tags   = [ "am-cns" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_INT.id
+      }
     }
   }
   tile {
@@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-cns_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PREPROD/dashboard/cd_am-cns_test.tf b/NA_PREPROD/dashboard/cd_am-cns_test.tf
index de54a45c..7f6762b8 100644
--- a/NA_PREPROD/dashboard/cd_am-cns_test.tf
+++ b/NA_PREPROD/dashboard/cd_am-cns_test.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
     tags   = [ "am-cns" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_TEST.id
+      }
     }
   }
   tile {
@@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-cns_TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-cns_e2e.tf b/NA_PROD/dashboard/cd_am-cns_e2e.tf
index 6f6b6415..774e1ac8 100644
--- a/NA_PROD/dashboard/cd_am-cns_e2e.tf
+++ b/NA_PROD/dashboard/cd_am-cns_e2e.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_E2E.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-cns_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-cns" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-cns_prod.tf b/NA_PROD/dashboard/cd_am-cns_prod.tf
index 845ebbb9..e2d43ae6 100644
--- a/NA_PROD/dashboard/cd_am-cns_prod.tf
+++ b/NA_PROD/dashboard/cd_am-cns_prod.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
     tags   = [ "am-cns" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_PROD.id
+      }
     }
   }
   tile {
@@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-cns", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}