diff --git a/NA_PROD/dashboard/cd_am-cns_e2e.tf b/NA_PROD/dashboard/cd_am-cns_e2e.tf
index 6f6b6415..a33f9ebf 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_PROD.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..a27d98a7 100644
--- a/NA_PROD/dashboard/cd_am-cns_prod.tf
+++ b/NA_PROD/dashboard/cd_am-cns_prod.tf
@@ -7,8 +7,15 @@ resource "dynatrace_dashboard" "CD_am-cns_PROD" {
     preset = true
     shared = true
     tags   = [ "am-cns" ]
+    unknowns = jsonencode({
+          "popularity": 1
+      })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-cns"
+        id   = data.dynatrace_management_zone.CD_am-cns_PROD.id
+      }
     }
   }
   tile {
@@ -67,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" ]
           }
         }
       }
@@ -195,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" ]
           }
         }
       }
@@ -246,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" ]
           }
         }
       }
@@ -279,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" ]
           }
         }
       }
@@ -312,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_PROD/dashboard/cd_am-lmcs_e2e.tf b/NA_PROD/dashboard/cd_am-lmcs_e2e.tf
index c674d3e2..5ce09f90 100644
--- a/NA_PROD/dashboard/cd_am-lmcs_e2e.tf
+++ b/NA_PROD/dashboard/cd_am-lmcs_e2e.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-lmcs"
+        id   = data.dynatrace_management_zone.CD_am-lmcs_PROD.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-lmcs" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-lmcs" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-lmcs" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-lmcs" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-lmcs" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-lmcs_prod.tf b/NA_PROD/dashboard/cd_am-lmcs_prod.tf
index e904474e..52e2c85e 100644
--- a/NA_PROD/dashboard/cd_am-lmcs_prod.tf
+++ b/NA_PROD/dashboard/cd_am-lmcs_prod.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-lmcs"
+        id   = data.dynatrace_management_zone.CD_am-lmcs_PROD.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-lmcs", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-lmcs", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-lmcs", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-lmcs", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-lmcs", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}