diff --git a/CN_PREPROD/alerting/cd_recall-notification-service_int.tf b/CN_PREPROD/alerting/cd_recall-notification-service_int.tf
new file mode 100644
index 00000000..ae5a90a6
--- /dev/null
+++ b/CN_PREPROD/alerting/cd_recall-notification-service_int.tf
@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_recall-notification-service_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ1MzZjM2I1OC00YzczLTRiZWYtOTJkNS05NzJmZDRmMzYzOTm-71TeFdrerQ
+data "dynatrace_management_zone" "CD_recall-notification-service_INT"{ name="CD_recall-notification-service" }
+resource "dynatrace_alerting" "CD_recall-notification-service_INT" {
+  name            = "CD_recall-notification-service INT"
+  management_zone = data.dynatrace_management_zone.CD_recall-notification-service_INT.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Component:recall-notification-service", "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Component:recall-notification-service", "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Component:recall-notification-service", "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Component:recall-notification-service", "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Component:recall-notification-service", "Environment:INT" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PREPROD/dashboard/cd_recall-notification-service_int.tf b/CN_PREPROD/dashboard/cd_recall-notification-service_int.tf
new file mode 100644
index 00000000..d25963df
--- /dev/null
+++ b/CN_PREPROD/dashboard/cd_recall-notification-service_int.tf
@@ -0,0 +1,294 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_INT.id = 5ebfc752-7e3a-4c55-94cf-88c0e52b82b2
+data "dynatrace_management_zone" "CD_recall-notification-service_INT"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_INT" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "recall-notification-service" ]
+    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_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 = [ "Component:recall-notification-service", "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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PREPROD/dashboard/cd_recall-notification-service_test.tf b/CN_PREPROD/dashboard/cd_recall-notification-service_test.tf
new file mode 100644
index 00000000..89271e6d
--- /dev/null
+++ b/CN_PREPROD/dashboard/cd_recall-notification-service_test.tf
@@ -0,0 +1,294 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_TEST.id = 19534ccb-4e0b-43f7-b11b-7300d38b6bf5
+data "dynatrace_management_zone" "CD_recall-notification-service_TEST"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_TEST" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "recall-notification-service" ]
+    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_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 = [ "Component:recall-notification-service", "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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PREPROD/management_zone/cd_recall-notification-service.tf b/CN_PREPROD/management_zone/cd_recall-notification-service.tf
new file mode 100644
index 00000000..93b5589a
--- /dev/null
+++ b/CN_PREPROD/management_zone/cd_recall-notification-service.tf
@@ -0,0 +1,95 @@
+# DEFINE dynatrace_management_zone.CD_recall-notification-service.id = -6299702691978032113
+resource "dynatrace_management_zone" "CD_recall-notification-service" {
+  name = "CD_recall-notification-service"
+  rules {
+    type    = "CLOUD_APPLICATION"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "CLOUD_APPLICATION_NAMESPACE"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "PROCESS_GROUP"
+    enabled           = true
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    enabled           = true
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+}
diff --git a/CN_PROD/alerting/cd_recall-notification-service_e2e.tf b/CN_PROD/alerting/cd_recall-notification-service_e2e.tf
new file mode 100644
index 00000000..709e5239
--- /dev/null
+++ b/CN_PROD/alerting/cd_recall-notification-service_e2e.tf
@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_recall-notification-service_E2E.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ1MTkyNjJmNy1lMWIwLTQ4MWItOTAwZS00MjE1MzQyNDZjMDi-71TeFdrerQ
+data "dynatrace_management_zone" "CD_recall-notification-service_E2E"{ name="CD_recall-notification-service" }
+resource "dynatrace_alerting" "CD_recall-notification-service_E2E" {
+  name            = "CD_recall-notification-service E2E"
+  management_zone = data.dynatrace_management_zone.CD_recall-notification-service_E2E.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:E2E", "Component:recall-notification-service" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:E2E", "Component:recall-notification-service" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:E2E", "Component:recall-notification-service" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:E2E", "Component:recall-notification-service" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:E2E", "Component:recall-notification-service" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/cd_recall-notification-service_prod.tf b/CN_PROD/dashboard/cd_recall-notification-service_prod.tf
new file mode 100644
index 00000000..faf1150d
--- /dev/null
+++ b/CN_PROD/dashboard/cd_recall-notification-service_prod.tf
@@ -0,0 +1,294 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_PROD.id = f1b04c2b-eb74-4e0f-93e4-fc8b3d572e61
+data "dynatrace_management_zone" "CD_recall-notification-service_PROD"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_PROD" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "recall-notification-service" ]
+    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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_PROD.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/CN_PROD/management_zone/cd_recall-notification-service.tf b/CN_PROD/management_zone/cd_recall-notification-service.tf
new file mode 100644
index 00000000..52efdb22
--- /dev/null
+++ b/CN_PROD/management_zone/cd_recall-notification-service.tf
@@ -0,0 +1,95 @@
+# DEFINE dynatrace_management_zone.CD_recall-notification-service.id = 1790910552265527232
+resource "dynatrace_management_zone" "CD_recall-notification-service" {
+  name = "CD_recall-notification-service"
+  rules {
+    type    = "CLOUD_APPLICATION"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "CLOUD_APPLICATION_NAMESPACE"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "PROCESS_GROUP"
+    enabled           = true
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    enabled           = true
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+}
diff --git a/EMEA_PREPROD/dashboard/cd_recall-notification-service_int.tf b/EMEA_PREPROD/dashboard/cd_recall-notification-service_int.tf
new file mode 100644
index 00000000..528e2300
--- /dev/null
+++ b/EMEA_PREPROD/dashboard/cd_recall-notification-service_int.tf
@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_INT.id = 5bc58c9e-92c1-48ae-98d4-b95c49296552
+data "dynatrace_management_zone" "CD_recall-notification-service_INT"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_INT" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_recall-notification-service" ]
+    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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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/EMEA_PREPROD/dashboard/cd_recall-notification-service_test.tf b/EMEA_PREPROD/dashboard/cd_recall-notification-service_test.tf
new file mode 100644
index 00000000..5554c8b7
--- /dev/null
+++ b/EMEA_PREPROD/dashboard/cd_recall-notification-service_test.tf
@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_TEST.id = ea5ea47c-5dbb-4224-97bd-e32a1ec8faba
+data "dynatrace_management_zone" "CD_recall-notification-service_TEST"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_TEST" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_recall-notification-service" ]
+    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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_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/EMEA_PREPROD/management_zone/cd_recall-notification-service.tf b/EMEA_PREPROD/management_zone/cd_recall-notification-service.tf
new file mode 100644
index 00000000..0b85f03c
--- /dev/null
+++ b/EMEA_PREPROD/management_zone/cd_recall-notification-service.tf
@@ -0,0 +1,143 @@
+# DEFINE dynatrace_management_zone.CD_recall-notification-service.id = 4369797148174425877
+resource "dynatrace_management_zone" "CD_recall-notification-service" {
+  name = "CD_recall-notification-service"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"ms-id:recall-notification-service\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"ms-id:recall-notification-service\")"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('ms-id:recall-notification-service'))"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(PROCESS_GROUP_INSTANCE),tag('ms-id:recall-notification-service')"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(Service),tag('msid:recall-notification-service')"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(Service),tag('ms-id:recall-notification-service')"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('msid:recall-notification-service'))"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(HOST),tag('ms-id:recall-notification-service')"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(HOST),tag('msid:recall-notification-service')"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"ms-id:recall-notification-service\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"ms-id:recall-notification-service\"))"
+  }
+  entity_selector_based_rule {
+    # enabled = false
+    selector  = "type(PROCESS_GROUP_INSTANCE),tag('msid:recall-notification-service')"
+  }
+  rules {
+    type      = "CLOUD_APPLICATION"
+    # enabled = false
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type      = "CLOUD_APPLICATION_NAMESPACE"
+    # enabled = false
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type      = "HOST"
+    # enabled = false
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "PROCESS_GROUP"
+    # enabled         = false
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    # enabled         = false
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+}
diff --git a/EMEA_PROD/dashboard/cd_recall-notification-service_prod.tf b/EMEA_PROD/dashboard/cd_recall-notification-service_prod.tf
new file mode 100644
index 00000000..5b24aee9
--- /dev/null
+++ b/EMEA_PROD/dashboard/cd_recall-notification-service_prod.tf
@@ -0,0 +1,324 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_PROD.id = a5609434-d703-4aad-8e4c-1e7a965fb8f4
+data "dynatrace_management_zone" "CD_recall-notification-service_PROD"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_PROD" {
+  dashboard_metadata {
+    name     = "CD_recall-notification-service PROD"
+    owner    = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset   = true
+    shared   = true
+    tags     = [ "recall-notification-service" ]
+    unknowns = jsonencode({
+          "popularity": 1
+      })
+    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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_PROD.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/EMEA_PROD/management_zone/cd_recall-notification-service.tf b/EMEA_PROD/management_zone/cd_recall-notification-service.tf
new file mode 100644
index 00000000..c8516c37
--- /dev/null
+++ b/EMEA_PROD/management_zone/cd_recall-notification-service.tf
@@ -0,0 +1,95 @@
+# DEFINE dynatrace_management_zone.CD_recall-notification-service.id = 3357098755062957648
+resource "dynatrace_management_zone" "CD_recall-notification-service" {
+  name = "CD_recall-notification-service"
+  rules {
+    type    = "CLOUD_APPLICATION"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "CLOUD_APPLICATION_NAMESPACE"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "PROCESS_GROUP"
+    enabled           = true
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    enabled           = true
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+}
diff --git a/NA_PREPROD/dashboard/cd_recall-notification-service_int.tf b/NA_PREPROD/dashboard/cd_recall-notification-service_int.tf
new file mode 100644
index 00000000..d2643bce
--- /dev/null
+++ b/NA_PREPROD/dashboard/cd_recall-notification-service_int.tf
@@ -0,0 +1,321 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_INT.id = 0a02d0e6-53db-40bb-9a0d-01e20e67e7d8
+data "dynatrace_management_zone" "CD_recall-notification-service_INT"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_INT" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "recall-notification-service" ]
+    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_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 = [ "Component:recall-notification-service", "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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "Environment:INT" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PREPROD/dashboard/cd_recall-notification-service_test.tf b/NA_PREPROD/dashboard/cd_recall-notification-service_test.tf
new file mode 100644
index 00000000..71fcf624
--- /dev/null
+++ b/NA_PREPROD/dashboard/cd_recall-notification-service_test.tf
@@ -0,0 +1,321 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_TEST.id = 4798960c-3f57-4c08-83b6-6dec5e265364
+data "dynatrace_management_zone" "CD_recall-notification-service_TEST"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_TEST" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "recall-notification-service" ]
+    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_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 = [ "Component:recall-notification-service", "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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "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_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 = [ "Component:recall-notification-service", "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PREPROD/management_zone/cd_recall-notification-service.tf b/NA_PREPROD/management_zone/cd_recall-notification-service.tf
new file mode 100644
index 00000000..049a4c22
--- /dev/null
+++ b/NA_PREPROD/management_zone/cd_recall-notification-service.tf
@@ -0,0 +1,95 @@
+# DEFINE dynatrace_management_zone.CD_recall-notification-service.id = -5076262166254517893
+resource "dynatrace_management_zone" "CD_recall-notification-service" {
+  name = "CD_recall-notification-service"
+  rules {
+    type    = "CLOUD_APPLICATION"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "CLOUD_APPLICATION_NAMESPACE"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "PROCESS_GROUP"
+    enabled           = true
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    enabled           = true
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+}
diff --git a/NA_PROD/dashboard/cd_recall-notification-service_prod.tf b/NA_PROD/dashboard/cd_recall-notification-service_prod.tf
new file mode 100644
index 00000000..56882aa4
--- /dev/null
+++ b/NA_PROD/dashboard/cd_recall-notification-service_prod.tf
@@ -0,0 +1,321 @@
+# DEFINE dynatrace_dashboard.CD_recall-notification-service_PROD.id = 3f1d44cb-b17b-4cbe-9584-ddabedaefaa8
+data "dynatrace_management_zone" "CD_recall-notification-service_PROD"{ name="CD_recall-notification-service" }
+resource "dynatrace_dashboard" "CD_recall-notification-service_PROD" {
+  dashboard_metadata {
+    name   = "CD_recall-notification-service PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "recall-notification-service" ]
+    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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  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_recall-notification-service"
+        id   = data.dynatrace_management_zone.CD_recall-notification-service_PROD.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  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_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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    unknowns      = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    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 = [ "Component:recall-notification-service", "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/NA_PROD/management_zone/cd_recall-notification-service.tf b/NA_PROD/management_zone/cd_recall-notification-service.tf
new file mode 100644
index 00000000..45b6b6a5
--- /dev/null
+++ b/NA_PROD/management_zone/cd_recall-notification-service.tf
@@ -0,0 +1,95 @@
+# DEFINE dynatrace_management_zone.CD_recall-notification-service.id = 293223536561869730
+resource "dynatrace_management_zone" "CD_recall-notification-service" {
+  name = "CD_recall-notification-service"
+  rules {
+    type    = "CLOUD_APPLICATION"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "CLOUD_APPLICATION_NAMESPACE"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+      string {
+        case_sensitive = true
+        # negate       = false
+        operator       = "CONTAINS"
+        value          = "recall-notification-service"
+      }
+    }
+  }
+  rules {
+    type    = "HOST"
+    enabled = true
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "HOST_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "PROCESS_GROUP"
+    enabled           = true
+    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "PROCESS_GROUP_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+  rules {
+    type              = "SERVICE"
+    enabled           = true
+    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
+    conditions {
+      key {
+        type      = "STATIC"
+        attribute = "SERVICE_TAGS"
+      }
+      tag {
+        # negate = false
+        operator = "EQUALS"
+        value {
+          context = "CONTEXTLESS"
+          key     = "Component"
+          value   = "recall-notification-service"
+        }
+      }
+    }
+  }
+}