diff --git a/EMEA_PREPROD/dashboard/cd_am-proxy_int.tf b/EMEA_PREPROD/dashboard/cd_am-proxy_int.tf
index 040a192e..6b009afc 100644
--- a/EMEA_PREPROD/dashboard/cd_am-proxy_int.tf
+++ b/EMEA_PREPROD/dashboard/cd_am-proxy_int.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_INT" {
     tags   = [ "CD_am-proxy" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_INT.id
+      }
     }
   }
   tile {
@@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_INT" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PREPROD/dashboard/cd_am-proxy_test.tf b/EMEA_PREPROD/dashboard/cd_am-proxy_test.tf
index bcb033b4..7b6d8ff5 100644
--- a/EMEA_PREPROD/dashboard/cd_am-proxy_test.tf
+++ b/EMEA_PREPROD/dashboard/cd_am-proxy_test.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_TEST" {
     tags   = [ "CD_am-proxy" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_TEST.id
+      }
     }
   }
   tile {
@@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_TEST" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-proxy_e2e.tf b/EMEA_PROD/dashboard/cd_am-proxy_e2e.tf
index 81ae9715..7ff5fafc 100644
--- a/EMEA_PROD/dashboard/cd_am-proxy_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_am-proxy_e2e.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_E2E" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_E2E.id
+      }
     }
   }
   tile {
@@ -357,4 +361,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_E2E" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-proxy_prod.tf b/EMEA_PROD/dashboard/cd_am-proxy_prod.tf
index 46da5453..bde8fc41 100644
--- a/EMEA_PROD/dashboard/cd_am-proxy_prod.tf
+++ b/EMEA_PROD/dashboard/cd_am-proxy_prod.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_PROD" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_PROD.id
+      }
     }
   }
   tile {
@@ -357,4 +361,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_PROD" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PREPROD/dashboard/cd_am-proxy_int.tf b/NA_PREPROD/dashboard/cd_am-proxy_int.tf
index 4f2ed4eb..b2b7e317 100644
--- a/NA_PREPROD/dashboard/cd_am-proxy_int.tf
+++ b/NA_PREPROD/dashboard/cd_am-proxy_int.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_INT" {
     tags   = [ "CD_am-proxy" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_INT.id
+      }
     }
   }
   tile {
@@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_INT" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PREPROD/dashboard/cd_am-proxy_test.tf b/NA_PREPROD/dashboard/cd_am-proxy_test.tf
index 73816397..ac43db52 100644
--- a/NA_PREPROD/dashboard/cd_am-proxy_test.tf
+++ b/NA_PREPROD/dashboard/cd_am-proxy_test.tf
@@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_TEST" {
     tags   = [ "CD_am-proxy" ]
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_TEST.id
+      }
     }
   }
   tile {
@@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_TEST" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-proxy_e2e.tf b/NA_PROD/dashboard/cd_am-proxy_e2e.tf
index f0b1e4ac..67182f58 100644
--- a/NA_PROD/dashboard/cd_am-proxy_e2e.tf
+++ b/NA_PROD/dashboard/cd_am-proxy_e2e.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_E2E" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_E2E.id
+      }
     }
   }
   tile {
@@ -357,4 +361,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_E2E" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-proxy_prod.tf b/NA_PROD/dashboard/cd_am-proxy_prod.tf
index 56210619..3e291ab4 100644
--- a/NA_PROD/dashboard/cd_am-proxy_prod.tf
+++ b/NA_PROD/dashboard/cd_am-proxy_prod.tf
@@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-proxy_PROD" {
       })
     filter {
       timeframe = "-24h to now"
+      management_zone {
+        name = "CD_am-proxy"
+        id   = data.dynatrace_management_zone.CD_am-proxy_PROD.id
+      }
     }
   }
   tile {
@@ -357,4 +361,4 @@ resource "dynatrace_dashboard" "CD_am-proxy_PROD" {
       }
     }
   }
-}
\ No newline at end of file
+}