diff --git a/CN_PREPROD/alerting/cd_eadb_int.tf b/CN_PREPROD/alerting/cd_eadb_int.tf
new file mode 100644
index 00000000..6415044f
--- /dev/null
+++ b/CN_PREPROD/alerting/cd_eadb_int.tf
@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_eadb_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ5NTk5Y2YzZS02NTZmLTQ3MDktYjZiMC1mMzJiOWNjZjZlYWK-71TeFdrerQ
+data "dynatrace_management_zone" "CD_eadb_INT"{ name="CD_eadb" }
+resource "dynatrace_alerting" "CD_eadb_INT" {
+  name            = "CD_eadb INT"
+  management_zone = data.dynatrace_management_zone.CD_eadb_INT.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:INT" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PREPROD/dashboard/cd_eadb_int.tf b/CN_PREPROD/dashboard/cd_eadb_int.tf
new file mode 100644
index 00000000..bc76baac
--- /dev/null
+++ b/CN_PREPROD/dashboard/cd_eadb_int.tf
@@ -0,0 +1,330 @@
+# DEFINE dynatrace_dashboard.CD_eadb_INT.id = 0dcc9aee-3dcb-428e-b3bc-95ede3d9dcf6
+data "dynatrace_management_zone" "CD_eadb_INT"{ name="CD_eadb" }
+resource "dynatrace_dashboard" "CD_eadb_INT" {
+  dashboard_metadata {
+    name   = "CD_eadb INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_eadb" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PREPROD/dashboard/cd_eadb_test.tf b/CN_PREPROD/dashboard/cd_eadb_test.tf
new file mode 100644
index 00000000..18ee57f6
--- /dev/null
+++ b/CN_PREPROD/dashboard/cd_eadb_test.tf
@@ -0,0 +1,330 @@
+# DEFINE dynatrace_dashboard.CD_eadb_TEST.id = d85c5bdd-3e37-439a-b906-b95af2f5c4b5
+data "dynatrace_management_zone" "CD_eadb_TEST"{ name="CD_eadb" }
+resource "dynatrace_dashboard" "CD_eadb_TEST" {
+  dashboard_metadata {
+    name   = "CD_eadb TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_eadb" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PREPROD/management_zone/cd_eadb.tf b/CN_PREPROD/management_zone/cd_eadb.tf
new file mode 100644
index 00000000..b0cd51c0
--- /dev/null
+++ b/CN_PREPROD/management_zone/cd_eadb.tf
@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_eadb.id = -8245138232697204908
+resource "dynatrace_management_zone" "CD_eadb" {
+  name = "CD_eadb"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:eadb","compass-id:eadb-frontend"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+}
diff --git a/CN_PROD/management_zone/cd_eadb.tf b/CN_PROD/management_zone/cd_eadb.tf
new file mode 100644
index 00000000..acaa8f99
--- /dev/null
+++ b/CN_PROD/management_zone/cd_eadb.tf
@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_eadb.id = 5558905216108512367
+resource "dynatrace_management_zone" "CD_eadb" {
+  name = "CD_eadb"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:eadb","compass-id:eadb-frontend"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+}
diff --git a/EMEA_PREPROD/management_zone/cd_eadb.tf b/EMEA_PREPROD/management_zone/cd_eadb.tf
new file mode 100644
index 00000000..5e09239a
--- /dev/null
+++ b/EMEA_PREPROD/management_zone/cd_eadb.tf
@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_eadb.id = 5446574522316733063
+resource "dynatrace_management_zone" "CD_eadb" {
+  name = "CD_eadb"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:eadb","compass-id:eadb-frontend"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+}
diff --git a/EMEA_PROD/alerting/cd_eadb_prod.tf b/EMEA_PROD/alerting/cd_eadb_prod.tf
new file mode 100644
index 00000000..4ca55793
--- /dev/null
+++ b/EMEA_PROD/alerting/cd_eadb_prod.tf
@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_eadb_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQyODI1Mjc5Yi1jYjI0LTNhMTctYjUwMy0xODQ4ZGQyMmI1MjK-71TeFdrerQ
+data "dynatrace_management_zone" "CD_eadb_PROD"{ name="CD_eadb" }
+resource "dynatrace_alerting" "CD_eadb_PROD" {
+  name            = "CD_eadb PROD"
+  management_zone = data.dynatrace_management_zone.CD_eadb_PROD.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:PROD" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/EMEA_PROD/management_zone/cd_eadb.tf b/EMEA_PROD/management_zone/cd_eadb.tf
new file mode 100644
index 00000000..cfbd9ac8
--- /dev/null
+++ b/EMEA_PROD/management_zone/cd_eadb.tf
@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_eadb.id = 7187056346821278083
+resource "dynatrace_management_zone" "CD_eadb" {
+  name = "CD_eadb"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:eadb","compass-id:eadb-frontend"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+}
diff --git a/NA_PREPROD/alerting/cd_eadb_int.tf b/NA_PREPROD/alerting/cd_eadb_int.tf
new file mode 100644
index 00000000..92f5f209
--- /dev/null
+++ b/NA_PREPROD/alerting/cd_eadb_int.tf
@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_eadb_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ2ZmZkOTJlNC01Y2FkLTNjYWMtYWU1Zi0wZGUwNTM2MzYyNDS-71TeFdrerQ
+data "dynatrace_management_zone" "CD_eadb_INT"{ name="CD_eadb" }
+resource "dynatrace_alerting" "CD_eadb_INT" {
+  name            = "CD_eadb INT"
+  management_zone = data.dynatrace_management_zone.CD_eadb_INT.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:INT" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PREPROD/dashboard/cd_eadb_int.tf b/NA_PREPROD/dashboard/cd_eadb_int.tf
new file mode 100644
index 00000000..58dc7b40
--- /dev/null
+++ b/NA_PREPROD/dashboard/cd_eadb_int.tf
@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_eadb_INT.id = dc56f6d9-99e8-4b66-a2ae-33f06d6a93d2
+data "dynatrace_management_zone" "CD_eadb_INT"{ name="CD_eadb" }
+resource "dynatrace_dashboard" "CD_eadb_INT" {
+  dashboard_metadata {
+    name   = "CD_eadb INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_eadb" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_INT.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PREPROD/dashboard/cd_eadb_test.tf b/NA_PREPROD/dashboard/cd_eadb_test.tf
new file mode 100644
index 00000000..1d15d851
--- /dev/null
+++ b/NA_PREPROD/dashboard/cd_eadb_test.tf
@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_eadb_TEST.id = 7f3dcb98-1006-448a-ad2b-c1eedd66b07c
+data "dynatrace_management_zone" "CD_eadb_TEST"{ name="CD_eadb" }
+resource "dynatrace_dashboard" "CD_eadb_TEST" {
+  dashboard_metadata {
+    name   = "CD_eadb TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_eadb" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_eadb"
+        id   = data.dynatrace_management_zone.CD_eadb_TEST.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PREPROD/management_zone/cd_eadb.tf b/NA_PREPROD/management_zone/cd_eadb.tf
new file mode 100644
index 00000000..4eb37b17
--- /dev/null
+++ b/NA_PREPROD/management_zone/cd_eadb.tf
@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_eadb.id = -3702960696588437080
+resource "dynatrace_management_zone" "CD_eadb" {
+  name = "CD_eadb"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:eadb","compass-id:eadb-frontend"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+}
diff --git a/NA_PROD/alerting/cd_eadb_prod.tf b/NA_PROD/alerting/cd_eadb_prod.tf
new file mode 100644
index 00000000..d4e97f3d
--- /dev/null
+++ b/NA_PROD/alerting/cd_eadb_prod.tf
@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_eadb_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQxY2JlYTA2OC0wZTAxLTNkNjItYTI5OC0zZDQ1MmNmMjEyODe-71TeFdrerQ
+data "dynatrace_management_zone" "CD_eadb_PROD"{ name="CD_eadb" }
+resource "dynatrace_alerting" "CD_eadb_PROD" {
+  name            = "CD_eadb PROD"
+  management_zone = data.dynatrace_management_zone.CD_eadb_PROD.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:PROD" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PROD/management_zone/cd_eadb.tf b/NA_PROD/management_zone/cd_eadb.tf
new file mode 100644
index 00000000..56bf90c1
--- /dev/null
+++ b/NA_PROD/management_zone/cd_eadb.tf
@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_eadb.id = 8690483301446283043
+resource "dynatrace_management_zone" "CD_eadb" {
+  name = "CD_eadb"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("compass-id:eadb","compass-id:eadb-frontend"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("compass-id:eadb","compass-id:eadb-frontend")
+    EOT
+  }
+}