diff --git a/CN_PREPROD/dashboard/cd_am-vms_int.tf b/CN_PREPROD/dashboard/cd_am-vms_int.tf
index ae86be26..3352530f 100644
--- a/CN_PREPROD/dashboard/cd_am-vms_int.tf
+++ b/CN_PREPROD/dashboard/cd_am-vms_int.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_INT.id
+      }
     }
   }
   tile {
@@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -80,12 +84,6 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_INT.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -180,7 +178,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -225,7 +223,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -255,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -285,10 +283,10 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/CN_PREPROD/dashboard/cd_am-vms_test.tf b/CN_PREPROD/dashboard/cd_am-vms_test.tf
index 9e8b05c5..82983975 100644
--- a/CN_PREPROD/dashboard/cd_am-vms_test.tf
+++ b/CN_PREPROD/dashboard/cd_am-vms_test.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_TEST.id
+      }
     }
   }
   tile {
@@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -80,12 +84,6 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_TEST.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -180,7 +178,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -225,7 +223,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -255,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -285,10 +283,10 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/CN_PROD/dashboard/cd_am-vms_e2e.tf b/CN_PROD/dashboard/cd_am-vms_e2e.tf
index ff11b39c..4813e629 100644
--- a/CN_PROD/dashboard/cd_am-vms_e2e.tf
+++ b/CN_PROD/dashboard/cd_am-vms_e2e.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_E2E.id
+      }
     }
   }
   tile {
@@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -80,12 +84,6 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_E2E.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -180,7 +178,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -225,7 +223,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -255,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -285,10 +283,10 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/CN_PROD/dashboard/cd_am-vms_prod.tf b/CN_PROD/dashboard/cd_am-vms_prod.tf
index b208e7b6..71aa6cda 100644
--- a/CN_PROD/dashboard/cd_am-vms_prod.tf
+++ b/CN_PROD/dashboard/cd_am-vms_prod.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_PROD.id
+      }
     }
   }
   tile {
@@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -80,12 +84,6 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_PROD.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -180,7 +178,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -225,7 +223,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -255,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -285,10 +283,10 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-vms_e2e.tf b/EMEA_PROD/dashboard/cd_am-vms_e2e.tf
index 8132a731..94d82808 100644
--- a/EMEA_PROD/dashboard/cd_am-vms_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_am-vms_e2e.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_E2E.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -89,12 +93,6 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_E2E.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -198,7 +196,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -249,7 +247,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -282,7 +280,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -315,10 +313,10 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-vms_prod.tf b/EMEA_PROD/dashboard/cd_am-vms_prod.tf
index 58fd3579..3c1cda3e 100644
--- a/EMEA_PROD/dashboard/cd_am-vms_prod.tf
+++ b/EMEA_PROD/dashboard/cd_am-vms_prod.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_PROD.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -89,12 +93,6 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_PROD.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -198,7 +196,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +247,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +280,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -315,10 +313,10 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PREPROD/dashboard/cd_am-vms_int.tf b/NA_PREPROD/dashboard/cd_am-vms_int.tf
index d0609716..530370f8 100644
--- a/NA_PREPROD/dashboard/cd_am-vms_int.tf
+++ b/NA_PREPROD/dashboard/cd_am-vms_int.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_INT.id
+      }
     }
   }
   tile {
@@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -86,12 +90,6 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_INT.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -195,7 +193,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -246,7 +244,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -279,7 +277,7 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -312,10 +310,10 @@ resource "dynatrace_dashboard" "CD_am-vms_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PREPROD/dashboard/cd_am-vms_test.tf b/NA_PREPROD/dashboard/cd_am-vms_test.tf
index f259f387..155f1225 100644
--- a/NA_PREPROD/dashboard/cd_am-vms_test.tf
+++ b/NA_PREPROD/dashboard/cd_am-vms_test.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_TEST.id
+      }
     }
   }
   tile {
@@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -86,12 +90,6 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_TEST.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -195,7 +193,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -246,7 +244,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -279,7 +277,7 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -312,10 +310,10 @@ resource "dynatrace_dashboard" "CD_am-vms_TEST" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:TEST" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-vms_e2e.tf b/NA_PROD/dashboard/cd_am-vms_e2e.tf
index 1167a72e..c1193662 100644
--- a/NA_PROD/dashboard/cd_am-vms_e2e.tf
+++ b/NA_PROD/dashboard/cd_am-vms_e2e.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
     tags   = [ "am-vms" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_E2E.id
+      }
     }
   }
   tile {
@@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -86,12 +90,6 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_E2E.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -195,7 +193,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -246,7 +244,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -279,7 +277,7 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -312,10 +310,10 @@ resource "dynatrace_dashboard" "CD_am-vms_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:am-vms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-vms_prod.tf b/NA_PROD/dashboard/cd_am-vms_prod.tf
index 8cb231d4..bdd95e3f 100644
--- a/NA_PROD/dashboard/cd_am-vms_prod.tf
+++ b/NA_PROD/dashboard/cd_am-vms_prod.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-vms"
+        id   = data.dynatrace_management_zone.CD_am-vms_PROD.id
+      }
     }
   }
   tile {
@@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -89,12 +93,6 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
       top    = 38
       width  = 152
     }
-    filter {
-      management_zone {
-        name = "CD_am-vms"
-        id   = data.dynatrace_management_zone.CD_am-vms_PROD.id
-      }
-    }
   }
   tile {
     name       = "Overall Health"
@@ -198,7 +196,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +247,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +280,7 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -315,10 +313,10 @@ resource "dynatrace_dashboard" "CD_am-vms_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-vms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}