diff --git a/aws/elasticsearch/variables.tf b/aws/elasticsearch/variables.tf
index d251705..66172c2 100644
--- a/aws/elasticsearch/variables.tf
+++ b/aws/elasticsearch/variables.tf
@@ -89,13 +89,13 @@ variable "cpu_utilization_evaluation_window" {
 }
 
 variable "cpu_utilization_threshold_critical" {
-  default     = 0.90
+  default     = 90
   description = "Critical threshold (percent)"
   type        = number
 }
 
 variable "cpu_utilization_threshold_warning" {
-  default     = 0.80
+  default     = 80
   description = "Warning threshold (percent)"
   type        = number
 }
diff --git a/aws/rds/variables.tf b/aws/rds/variables.tf
index 64f2191..2f085d9 100644
--- a/aws/rds/variables.tf
+++ b/aws/rds/variables.tf
@@ -23,7 +23,7 @@ variable "connection_count_anomaly_enabled" {
 }
 
 variable "connection_count_anomaly_evaluation_window" {
-  default     = "last_1h"
+  default     = "last_4h"
   description = "Evaluation window for monitor (`last_?m` (1, 5, 10, 15, or 30), `last_?h` (1, 2, or 4), or `last_1d`]"
   type        = string
 }
diff --git a/host/agent/main.tf b/host/agent/main.tf
index 7377cdb..dc54b4d 100644
--- a/host/agent/main.tf
+++ b/host/agent/main.tf
@@ -4,32 +4,34 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_monitor" "host_unreachable" {
   count = var.host_unreachable_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "Host Unreachable - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "Datadog Agent Status - {{name.name}}", local.title_suffix])
+  include_tags = false
+  message      = var.host_unreachable_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "service check"
 
   evaluation_delay    = var.evaluation_delay
   new_group_delay     = var.new_group_delay
-  notify_no_data      = var.notify_no_data
+  no_data_timeframe = "5"
+  notify_no_data      = true
   renotify_interval   = var.renotify_interval
   require_full_window = true
   timeout_h           = var.timeout_h
 
   query = <<EOQ
-    "datadog.agent.up"${local.service_filter}.by("host").last(6).count_by_status()
+    "datadog.agent.up"${local.service_filter}.by("name","aws_account","env","datadog_managed").last(2).count_by_status()
   EOQ
 
   monitor_thresholds {
     ok       = 1
     warning  = 1
-    critical = 5
+    critical = 1
   }
 }
diff --git a/host/agent/variables.tf b/host/agent/variables.tf
index a5c350b..40a9b9b 100644
--- a/host/agent/variables.tf
+++ b/host/agent/variables.tf
@@ -21,3 +21,9 @@ variable "host_unreachable_enabled" {
   description = "Flag to enable Host unreachable monitor"
   type        = bool
 }
+
+variable "host_unreachable_use_message" {
+  default     = true
+  description = "Flag to enable Host unreachable alerting"
+  type        = bool
+}
\ No newline at end of file
diff --git a/host/clock/main.tf b/host/clock/main.tf
index 9b9ccc0..94ce70c 100644
--- a/host/clock/main.tf
+++ b/host/clock/main.tf
@@ -4,27 +4,28 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_monitor" "system_clock" {
   count = var.system_clock_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "System Clock - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "System Clock - {{name.name}}", local.title_suffix])
+  include_tags = false
+  message      = var.system_clock_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "service check"
 
   evaluation_delay    = var.evaluation_delay
   new_group_delay     = var.new_group_delay
-  notify_no_data      = var.notify_no_data
+  notify_no_data      = false
   renotify_interval   = var.renotify_interval
   require_full_window = true
   timeout_h           = var.timeout_h
 
   query = <<EOQ
-    "ntp.in_sync"${local.service_filter}.by("host").last(6).count_by_status()
+    "ntp.in_sync"${local.service_filter}.by("name","aws_account","env","datadog_managed").last(6).count_by_status()
   EOQ
 
   monitor_thresholds {
diff --git a/host/clock/variables.tf b/host/clock/variables.tf
index 9ced19e..bfd7ba3 100644
--- a/host/clock/variables.tf
+++ b/host/clock/variables.tf
@@ -21,3 +21,9 @@ variable "system_clock_enabled" {
   description = "Flag to enable Host unreachable monitor"
   type        = bool
 }
+
+variable "system_clock_use_message" {
+  default     = false
+  description = "Flag to enable Host unreachable alerting"
+  type        = bool
+}
\ No newline at end of file
diff --git a/host/cpu/main.tf b/host/cpu/main.tf
index e3542d9..88fc47e 100644
--- a/host/cpu/main.tf
+++ b/host/cpu/main.tf
@@ -4,29 +4,31 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_monitor" "cpu_utilization" {
   count = var.cpu_utilization_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "CPU Utilization - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "CPU Utilization - {{name.name}}", local.title_suffix])
+  message      = var.cpu_utilization_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "query alert"
 
   evaluation_delay    = var.evaluation_delay
   new_group_delay     = var.new_group_delay
-  notify_no_data      = var.notify_no_data
+  notify_no_data      = false
   no_data_timeframe   = var.cpu_utilization_no_data_window
   renotify_interval   = var.renotify_interval
   require_full_window = true
   timeout_h           = var.timeout_h
+  include_tags = false
+
 
   query = <<EOQ
     ${var.cpu_utilization_time_aggregator}(${var.cpu_utilization_timeframe}): (
-      100 - avg:system.cpu.idle${local.query_filter} by {host}
+      100 - avg:system.cpu.idle${local.query_filter} by {name,aws_account,env,datadog_managed}
     ) > ${var.cpu_utilization_threshold_critical}
   EOQ
 
diff --git a/host/cpu/variables.tf b/host/cpu/variables.tf
index 049e904..69e1f30 100644
--- a/host/cpu/variables.tf
+++ b/host/cpu/variables.tf
@@ -51,3 +51,9 @@ variable "cpu_utilization_threshold_warning" {
   description = "Warning threshold (percent)"
   type        = number
 }
+
+variable "cpu_utilization_use_message" {
+  default     = false
+  description = "Flag to enable CPU Utilitzation alerting"
+  type        = bool
+}
\ No newline at end of file
diff --git a/host/disk/main.tf b/host/disk/main.tf
index ca4ce0f..e6e4c4c 100644
--- a/host/disk/main.tf
+++ b/host/disk/main.tf
@@ -4,15 +4,15 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_monitor" "disk_space" {
   count = var.disk_space_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "Disk Space - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "Disk Space - {{name.name}}", local.title_suffix])
+  message      = var.disk_space_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "query alert"
 
@@ -26,7 +26,7 @@ resource "datadog_monitor" "disk_space" {
 
   query = <<EOQ
     ${var.disk_space_time_aggregator}(${var.disk_space_timeframe}):
-      avg:system.disk.in_use${local.query_filter} by {host,device}
+      avg:system.disk.in_use${local.query_filter} by {name,aws_account,device,env,datadog_managed}
     * 100 > ${var.disk_space_threshold_critical}
   EOQ
 
@@ -39,8 +39,9 @@ resource "datadog_monitor" "disk_space" {
 resource "datadog_monitor" "disk_space_forecast" {
   count = var.disk_space_forecast_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "Disk Space Forecast - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "Disk Space Forecast - {{name.name}}", local.title_suffix])
+  include_tags = false
+  message      = var.disk_space_forecast_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "query alert"
 
@@ -48,14 +49,13 @@ resource "datadog_monitor" "disk_space_forecast" {
   new_group_delay     = var.new_group_delay
   notify_audit        = false
   timeout_h           = var.timeout_h
-  include_tags        = true
   require_full_window = true
   notify_no_data      = false
   renotify_interval   = 0
 
   query = <<EOQ
     ${var.disk_space_forecast_time_aggregator}(${var.disk_space_forecast_timeframe}):
-      forecast(avg:system.disk.in_use${local.query_filter} by {host,device} * 100,
+      forecast(avg:system.disk.in_use${local.query_filter} by {name,aws_account,device,env,datadog_managed} * 100,
               '${var.disk_space_forecast_algorithm}',
                ${var.disk_space_forecast_deviations},
                interval='${var.disk_space_forecast_interval}',
@@ -74,14 +74,15 @@ resource "datadog_monitor" "disk_space_forecast" {
 resource "datadog_monitor" "disk_inodes" {
   count = var.disk_inodes_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "Disk Inodes Usage - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "Disk Inodes Usage - {{name.name}}", local.title_suffix])
+  include_tags = false
+  message      = var.disk_inodes_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "query alert"
 
   query = <<EOQ
     ${var.disk_inodes_time_aggregator}(${var.disk_inodes_timeframe}):
-      avg:system.fs.inodes.in_use${local.query_filter} by {host,device}
+      avg:system.fs.inodes.in_use${local.query_filter} by {name,aws_account,device,env,datadog_managed}
     * 100 > ${var.disk_inodes_threshold_critical}
   EOQ
 
@@ -90,7 +91,6 @@ resource "datadog_monitor" "disk_inodes" {
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = var.timeout_h
-  include_tags        = true
   require_full_window = true
 
   monitor_thresholds {
diff --git a/host/disk/variables.tf b/host/disk/variables.tf
index b9c36fa..7b6e21a 100644
--- a/host/disk/variables.tf
+++ b/host/disk/variables.tf
@@ -46,6 +46,12 @@ variable "disk_space_threshold_critical" {
   default     = 90
 }
 
+variable "disk_space_use_message" {
+  description = "Flag to enable Free diskspace alerting"
+  type        = string
+  default     = "true"
+}
+
 ########################################
 # Disk Space Forecast
 ########################################
@@ -115,6 +121,12 @@ variable "disk_space_forecast_threshold_critical" {
   default     = 80
 }
 
+variable "disk_space_forecast_use_message" {
+  description = "Flag to enable Free diskspace forecast alerting"
+  type        = string
+  default     = "false"
+}
+
 ########################################
 # Disk Inodes
 ########################################
@@ -147,3 +159,9 @@ variable "disk_inodes_threshold_critical" {
   type        = number
   default     = 95
 }
+
+variable "disk_inodes_use_message" {
+  description = "Flag to enable Free disk inodes alerting"
+  type        = string
+  default     = "true"
+}
\ No newline at end of file
diff --git a/host/memory/main.tf b/host/memory/main.tf
index 129bd45..d5e1ac5 100644
--- a/host/memory/main.tf
+++ b/host/memory/main.tf
@@ -4,22 +4,23 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_monitor" "memory" {
   count = var.memory_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "Usable Memory - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "Usable Memory - {{name.name}}", local.title_suffix])
+  include_tags = false
+  message      = var.memory_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "query alert"
 
   query = <<EOQ
     ${var.memory_time_aggregator}(${var.memory_timeframe}):
-      avg:system.mem.usable${local.query_filter} by {host} /
-      avg:system.mem.total${local.query_filter} by {host} * 100
+      avg:system.mem.usable${local.query_filter} by {name,aws_account,env,datadog_managed} /
+      avg:system.mem.total${local.query_filter} by {name,aws_account,env,datadog_managed} * 100
     < ${var.memory_threshold_critical}
   EOQ
 
@@ -29,7 +30,6 @@ resource "datadog_monitor" "memory" {
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = var.timeout_h
-  include_tags        = true
   require_full_window = true
 
   monitor_thresholds {
diff --git a/host/memory/variables.tf b/host/memory/variables.tf
index 810fb3a..ac6c783 100644
--- a/host/memory/variables.tf
+++ b/host/memory/variables.tf
@@ -45,3 +45,9 @@ variable "memory_threshold_critical" {
   type        = number
   default     = 5
 }
+
+variable "memory_use_message" {
+  description = "Flag to enable Free memory alerting"
+  type        = string
+  default     = "true"
+}
\ No newline at end of file
diff --git a/host/process/main.tf b/host/process/main.tf
index 7918fbd..c0ddd76 100644
--- a/host/process/main.tf
+++ b/host/process/main.tf
@@ -4,7 +4,7 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
@@ -12,7 +12,7 @@ resource "datadog_monitor" "process_alert" {
   count = var.process_alert_enabled ? 1 : 0
 
   name    = join("", [local.title_prefix, "Process Alert - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  message      = var.process_alert_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "process alert"
 
@@ -21,7 +21,7 @@ resource "datadog_monitor" "process_alert" {
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = var.timeout_h
-  include_tags        = true
+  include_tags        = false
   require_full_window = true
 
   query = <<EOQ
diff --git a/host/process/variables.tf b/host/process/variables.tf
index 21e441a..ef14f02 100644
--- a/host/process/variables.tf
+++ b/host/process/variables.tf
@@ -51,3 +51,9 @@ variable "process_alert_operator" {
   type        = string
   default     = "<"
 }
+
+variable "process_alert_use_message" {
+  description = "Flag to enable Process Check alerting"
+  type        = string
+  default     = "true"
+}
\ No newline at end of file
diff --git a/host/swap/main.tf b/host/swap/main.tf
index 429cc03..211a957 100644
--- a/host/swap/main.tf
+++ b/host/swap/main.tf
@@ -4,21 +4,21 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_monitor" "swap" {
   count = var.swap_enabled ? 1 : 0
 
-  name    = join("", [local.title_prefix, "Usable Swap - {{host.name}}", local.title_suffix])
-  message = local.query_alert_base_message
+  name    = join("", [local.title_prefix, "Usable Swap - {{name.name}}", local.title_suffix])
+  message      = var.swap_use_message ? local.query_alert_base_message : ""
   tags    = concat(local.common_tags, var.base_tags, var.additional_tags)
   type    = "query alert"
 
   query = <<EOQ
     ${var.swap_time_aggregator}(${var.swap_timeframe}):
-      avg:system.swap.pct_free${local.query_filter} by {host}
+      avg:system.swap.pct_free${local.query_filter} by {name,aws_account,env,datadog_managed}
     < ${var.swap_threshold_critical}
   EOQ
 
@@ -28,7 +28,7 @@ resource "datadog_monitor" "swap" {
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = var.timeout_h
-  include_tags        = true
+  include_tags        = false
   require_full_window = true
 
   monitor_thresholds {
diff --git a/host/swap/variables.tf b/host/swap/variables.tf
index 4a7aa82..c900708 100644
--- a/host/swap/variables.tf
+++ b/host/swap/variables.tf
@@ -45,3 +45,9 @@ variable "swap_threshold_critical" {
   type        = number
   default     = 0.1
 }
+
+variable "swap_use_message" {
+  description = "Flag to enable Swap alerting"
+  type        = string
+  default     = "false"
+}
\ No newline at end of file
diff --git a/synthetics/ssl/main.tf b/synthetics/ssl/main.tf
index cf84ba8..b165446 100644
--- a/synthetics/ssl/main.tf
+++ b/synthetics/ssl/main.tf
@@ -4,18 +4,29 @@ locals {
   monitor_warn_default_priority   = null
   monitor_nodata_default_priority = null
 
-  title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}[${var.env}] "
+  title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
   title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
 }
 
 resource "datadog_synthetics_test" "ssl" {
   count = var.ssl_synthetic_enabled ? 1 : 0
 
-  name      = join("", [local.title_prefix, "Certificate", local.title_suffix])
+  name      = join("", [local.title_prefix, "SSL Certificate expiration - ${var.ssl_synthetic_host}", local.title_suffix])
   type      = "api"
   subtype   = "ssl"
   status    = "live"
-  message   = local.synthetic_alert_base_message
+  message = <<-EOT
+    {{#is_alert}}
+    ${local.notify_on_prod}
+    SSL certificate is expiring in less than {{threshold}} days.
+    Please renew the certificate to prevent service disruption.
+    {{/is_alert}}
+
+    {{#is_recovery}}
+    ${local.notify_on_prod}
+    SSL certificate has been renewed and is no longer at risk of expiring.
+    {{/is_recovery}}
+    EOT
   locations = var.ssl_synthetic_locations
   tags      = concat(local.common_tags, var.base_tags, var.additional_tags)
 
@@ -30,20 +41,30 @@ resource "datadog_synthetics_test" "ssl" {
     target   = var.ssl_synthetic_days_to_expiration
   }
 
-  assertion {
-    type     = "tlsVersion"
-    operator = "moreThanOrEqual"
-    target   = var.ssl_synthetic_min_tls_version
+  dynamic "assertion" {
+    for_each = var.ssl_synthetic_tls_check_enabled ? [1] : []
+    content {
+      type     = "tlsVersion"
+      operator = "moreThanOrEqual"
+      target   = var.ssl_synthetic_min_tls_version
+    }
   }
 
-  assertion {
-    type     = "responseTime"
-    operator = "lessThan"
-    target   = var.ssl_synthetic_max_response_time
+  dynamic "assertion" {
+    for_each = var.ssl_synthetic_response_time_check_enabled ? [1] : []
+    content {
+      type     = "responseTime"
+      operator = "lessThan"
+      target   = var.ssl_synthetic_max_response_time
+    }
   }
 
   options_list {
     tick_every         = var.ssl_synthetic_tick_every
     accept_self_signed = var.ssl_synthetic_accept_self_signed
+
+    monitor_options {
+      renotify_interval = var.ssl_synthetic_renotify_interval
+    }
   }
 }
diff --git a/synthetics/ssl/variables.tf b/synthetics/ssl/variables.tf
index 6d2662a..bceaf7e 100644
--- a/synthetics/ssl/variables.tf
+++ b/synthetics/ssl/variables.tf
@@ -42,7 +42,7 @@ variable "ssl_synthetic_port" {
 variable "ssl_synthetic_days_to_expiration" {
   description = "Number of Days till certificate expiration for SSL Synthetic Test to alert."
   type        = number
-  default     = 7
+  default     = 30
 }
 
 variable "ssl_synthetic_min_tls_version" {
@@ -57,10 +57,16 @@ variable "ssl_synthetic_max_response_time" {
   default     = 2000
 }
 
+variable "ssl_synthetic_renotify_interval" {
+  description = "How often SSL Synthetic Test should renotify in minutes."
+  type        = number
+  default     = 10080
+}
+
 variable "ssl_synthetic_tick_every" {
   description = "How often SSL Synthetic Test should run in seconds."
   type        = number
-  default     = 900
+  default     = 86400
 }
 
 variable "ssl_synthetic_accept_self_signed" {
@@ -68,3 +74,15 @@ variable "ssl_synthetic_accept_self_signed" {
   type        = bool
   default     = false
 }
+
+variable "ssl_synthetic_tls_check_enabled" {
+  type        = bool
+  description = "Enable TLS version checking in the synthetic test"
+  default     = false
+}
+
+variable "ssl_synthetic_response_time_check_enabled" {
+  type        = bool
+  description = "Enable response time checking in the synthetic test"
+  default     = false
+}