diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md
index 96f6269..679a2e1 100644
--- a/cloud/aws/alb/README.md
+++ b/cloud/aws/alb/README.md
@@ -30,44 +30,40 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| alb_no_healthy_instances_aggregator | Monitor aggregator for ALB no healthy instances [available values: min, max, sum or avg] | string | `min` | no |
 | alb_no_healthy_instances_message | Custom message for ALB no healthy instances monitor | string | `` | no |
 | alb_no_healthy_instances_silenced | Groups to mute for ALB no healthy instances monitor | map | `<map>` | no |
-| alb_no_healthy_instances_timeframe | Monitor timeframe for ALB no healthy instances [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1m` | no |
+| alb_no_healthy_instances_time_aggregator | Monitor aggregator for ALB no healthy instances [available values: min, max or avg] | string | `min` | no |
+| alb_no_healthy_instances_timeframe | Monitor timeframe for ALB no healthy instances [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | artificial_requests_count | Number of false requests used to mitigate false positive in case of low trafic | string | `5` | no |
 | delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Architecture environment | string | - | yes |
 | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
 | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
-| httpcode_elb_4xx_aggregator | Monitor aggregator for ALB httpcode 4xx [available values: min, max, sum or avg] | string | `min` | no |
-| httpcode_elb_4xx_message | Custom message for ALB httpcode 4xx monitor | string | `` | no |
-| httpcode_elb_4xx_silenced | Groups to mute for ALB httpcode 4xx monitor | map | `<map>` | no |
-| httpcode_elb_4xx_threshold_critical | loadbalancer 4xx critical threshold in percentage | string | `80` | no |
-| httpcode_elb_4xx_threshold_warning | loadbalancer 4xx warning threshold in percentage | string | `60` | no |
-| httpcode_elb_4xx_timeframe | Monitor timeframe for ALB httpcode 4xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| httpcode_elb_5xx_aggregator | Monitor aggregator for ALB httpcode 5xx [available values: min, max, sum or avg] | string | `min` | no |
-| httpcode_elb_5xx_message | Custom message for ALB httpcode 5xx monitor | string | `` | no |
-| httpcode_elb_5xx_silenced | Groups to mute for ALB httpcode 5xx monitor | map | `<map>` | no |
-| httpcode_elb_5xx_threshold_critical | loadbalancer 5xxcritical threshold in percentage | string | `80` | no |
-| httpcode_elb_5xx_threshold_warning | loadbalancer 5xx warning threshold in percentage | string | `60` | no |
-| httpcode_elb_5xx_timeframe | Monitor timeframe for ALB httpcode 5xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| httpcode_target_4xx_aggregator | Monitor aggregator for ALB target httpcode 4xx [available values: min, max, sum or avg] | string | `min` | no |
+| httpcode_alb_4xx_message | Custom message for ALB httpcode 4xx monitor | string | `` | no |
+| httpcode_alb_4xx_silenced | Groups to mute for ALB httpcode 4xx monitor | map | `<map>` | no |
+| httpcode_alb_4xx_threshold_critical | loadbalancer 4xx critical threshold in percentage | string | `80` | no |
+| httpcode_alb_4xx_threshold_warning | loadbalancer 4xx warning threshold in percentage | string | `60` | no |
+| httpcode_alb_4xx_timeframe | Monitor timeframe for ALB httpcode 4xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
+| httpcode_alb_5xx_message | Custom message for ALB httpcode 5xx monitor | string | `` | no |
+| httpcode_alb_5xx_silenced | Groups to mute for ALB httpcode 5xx monitor | map | `<map>` | no |
+| httpcode_alb_5xx_threshold_critical | loadbalancer 5xxcritical threshold in percentage | string | `80` | no |
+| httpcode_alb_5xx_threshold_warning | loadbalancer 5xx warning threshold in percentage | string | `60` | no |
+| httpcode_alb_5xx_timeframe | Monitor timeframe for ALB httpcode 5xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | httpcode_target_4xx_message | Custom message for ALB target httpcode 4xx monitor | string | `` | no |
 | httpcode_target_4xx_silenced | Groups to mute for ALB target httpcode 4xx monitor | map | `<map>` | no |
 | httpcode_target_4xx_threshold_critical | target 4xx critical threshold in percentage | string | `80` | no |
 | httpcode_target_4xx_threshold_warning | target 4xx warning threshold in percentage | string | `60` | no |
 | httpcode_target_4xx_timeframe | Monitor timeframe for ALB target httpcode 4xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| httpcode_target_5xx_aggregator | Monitor aggregator for ALB target httpcode 5xx [available values: min, max, sum or avg] | string | `min` | no |
 | httpcode_target_5xx_message | Custom message for ALB target httpcode 5xx monitor | string | `` | no |
 | httpcode_target_5xx_silenced | Groups to mute for ALB target httpcode 5xx monitor | map | `<map>` | no |
 | httpcode_target_5xx_threshold_critical | target 5xx critical threshold in percentage | string | `80` | no |
 | httpcode_target_5xx_threshold_warning | target 5xx warning threshold in percentage | string | `60` | no |
 | httpcode_target_5xx_timeframe | Monitor timeframe for ALB target httpcode 5xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| latency_aggregator | Monitor aggregator for ALB latency [available values: min, max, sum or avg] | string | `max` | no |
 | latency_message | Custom message for ALB latency monitor | string | `` | no |
 | latency_silenced | Groups to mute for ALB latency monitor | map | `<map>` | no |
 | latency_threshold_critical | latency critical threshold in milliseconds | string | `1000` | no |
 | latency_threshold_warning | latency warning threshold in milliseconds | string | `500` | no |
+| latency_time_aggregator | Monitor aggregator for ALB latency [available values: min, max or avg] | string | `min` | no |
 | latency_timeframe | Monitor timeframe for ALB latency [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | message | Message sent when a monitor is triggered | string | - | yes |
 
diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf
index de2c7cd..584c299 100644
--- a/cloud/aws/alb/inputs.tf
+++ b/cloud/aws/alb/inputs.tf
@@ -38,8 +38,8 @@ variable "alb_no_healthy_instances_message" {
   default     = ""
 }
 
-variable "alb_no_healthy_instances_aggregator" {
-  description = "Monitor aggregator for ALB no healthy instances [available values: min, max, sum or avg]"
+variable "alb_no_healthy_instances_time_aggregator" {
+  description = "Monitor aggregator for ALB no healthy instances [available values: min, max or avg]"
   type        = "string"
   default     = "min"
 }
@@ -62,8 +62,8 @@ variable "latency_message" {
   default     = ""
 }
 
-variable "latency_aggregator" {
-  description = "Monitor aggregator for ALB latency [available values: min, max, sum or avg]"
+variable "latency_time_aggregator" {
+  description = "Monitor aggregator for ALB latency [available values: min, max or avg]"
   type        = "string"
   default     = "min"
 }
@@ -84,36 +84,30 @@ variable "latency_threshold_warning" {
   description = "latency warning threshold in milliseconds"
 }
 
-variable "httpcode_elb_4xx_silenced" {
+variable "httpcode_alb_4xx_silenced" {
   description = "Groups to mute for ALB httpcode 4xx monitor"
   type        = "map"
   default     = {}
 }
 
-variable "httpcode_elb_4xx_message" {
+variable "httpcode_alb_4xx_message" {
   description = "Custom message for ALB httpcode 4xx monitor"
   type        = "string"
   default     = ""
 }
 
-variable "httpcode_elb_4xx_aggregator" {
-  description = "Monitor aggregator for ALB httpcode 4xx [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
-variable "httpcode_elb_4xx_timeframe" {
+variable "httpcode_alb_4xx_timeframe" {
   description = "Monitor timeframe for ALB httpcode 4xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
   default     = "last_5m"
 }
 
-variable "httpcode_elb_4xx_threshold_critical" {
+variable "httpcode_alb_4xx_threshold_critical" {
   default     = 80
   description = "loadbalancer 4xx critical threshold in percentage"
 }
 
-variable "httpcode_elb_4xx_threshold_warning" {
+variable "httpcode_alb_4xx_threshold_warning" {
   default     = 60
   description = "loadbalancer 4xx warning threshold in percentage"
 }
@@ -130,12 +124,6 @@ variable "httpcode_target_4xx_message" {
   default     = ""
 }
 
-variable "httpcode_target_4xx_aggregator" {
-  description = "Monitor aggregator for ALB target httpcode 4xx [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "httpcode_target_4xx_timeframe" {
   description = "Monitor timeframe for ALB target httpcode 4xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
@@ -152,36 +140,30 @@ variable "httpcode_target_4xx_threshold_warning" {
   description = "target 4xx warning threshold in percentage"
 }
 
-variable "httpcode_elb_5xx_silenced" {
+variable "httpcode_alb_5xx_silenced" {
   description = "Groups to mute for ALB httpcode 5xx monitor"
   type        = "map"
   default     = {}
 }
 
-variable "httpcode_elb_5xx_message" {
+variable "httpcode_alb_5xx_message" {
   description = "Custom message for ALB httpcode 5xx monitor"
   type        = "string"
   default     = ""
 }
 
-variable "httpcode_elb_5xx_aggregator" {
-  description = "Monitor aggregator for ALB httpcode 5xx [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
-variable "httpcode_elb_5xx_timeframe" {
+variable "httpcode_alb_5xx_timeframe" {
   description = "Monitor timeframe for ALB httpcode 5xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
   default     = "last_5m"
 }
 
-variable "httpcode_elb_5xx_threshold_critical" {
+variable "httpcode_alb_5xx_threshold_critical" {
   default     = 80
   description = "loadbalancer 5xxcritical threshold in percentage"
 }
 
-variable "httpcode_elb_5xx_threshold_warning" {
+variable "httpcode_alb_5xx_threshold_warning" {
   default     = 60
   description = "loadbalancer 5xx warning threshold in percentage"
 }
@@ -198,12 +180,6 @@ variable "httpcode_target_5xx_message" {
   default     = ""
 }
 
-variable "httpcode_target_5xx_aggregator" {
-  description = "Monitor aggregator for ALB target httpcode 5xx [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "httpcode_target_5xx_timeframe" {
   description = "Monitor timeframe for ALB target httpcode 5xx [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf
index e9272b2..72fb533 100644
--- a/cloud/aws/alb/monitors-alb.tf
+++ b/cloud/aws/alb/monitors-alb.tf
@@ -14,8 +14,8 @@ resource "datadog_monitor" "ALB_no_healthy_instances" {
   message = "${coalesce(var.alb_no_healthy_instances_message, var.message)}"
 
   query = <<EOF
-    ${var.alb_no_healthy_instances_aggregator}(${var.alb_no_healthy_instances_timeframe}): (
-      ${var.alb_no_healthy_instances_aggregator}:aws.applicationelb.healthy_host_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
+    ${var.alb_no_healthy_instances_time_aggregator}(${var.alb_no_healthy_instances_timeframe}): (
+      min:aws.applicationelb.healthy_host_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
     ) <= 0
   EOF
 
@@ -43,8 +43,8 @@ resource "datadog_monitor" "ALB_latency" {
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOF
-    ${var.latency_aggregator}(${var.latency_timeframe}): (
-      ${var.latency_aggregator}:aws.applicationelb.target_response_time.average{${data.template_file.filter.rendered}} by {region,loadbalancer}
+    ${var.latency_time_aggregator}(${var.latency_timeframe}): (
+      min:aws.applicationelb.target_response_time.average{${data.template_file.filter.rendered}} by {region,loadbalancer}
     ) > ${var.latency_threshold_critical}
   EOF
 
@@ -67,26 +67,26 @@ resource "datadog_monitor" "ALB_latency" {
   tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
 }
 
-resource "datadog_monitor" "ALB_httpcode_elb_5xx" {
+resource "datadog_monitor" "ALB_httpcode_5xx" {
   name    = "[${var.environment}] ALB HTTP code 5xx {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
-  message = "${coalesce(var.httpcode_elb_5xx_message, var.message)}"
+  message = "${coalesce(var.httpcode_alb_5xx_message, var.message)}"
 
   query = <<EOF
-    ${var.httpcode_elb_5xx_aggregator}(${var.httpcode_elb_5xx_timeframe}): (
+    sum(${var.httpcode_alb_5xx_timeframe}): (
       default(
-        ${var.httpcode_elb_5xx_aggregator}:aws.applicationelb.httpcode_elb_5xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
-        (${var.httpcode_elb_5xx_aggregator}:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
+        min:aws.applicationelb.httpcode_alb_5xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
+        (min:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
       0) * 100
-    ) > ${var.httpcode_elb_5xx_threshold_critical}
+    ) > ${var.httpcode_alb_5xx_threshold_critical}
   EOF
 
   evaluation_delay = "${var.delay}"
   new_host_delay   = "${var.delay}"
 
   thresholds {
-    critical = "${var.httpcode_elb_5xx_threshold_critical}"
-    warning  = "${var.httpcode_elb_5xx_threshold_warning}"
+    critical = "${var.httpcode_alb_5xx_threshold_critical}"
+    warning  = "${var.httpcode_alb_5xx_threshold_warning}"
   }
 
   notify_no_data      = false
@@ -95,31 +95,31 @@ resource "datadog_monitor" "ALB_httpcode_elb_5xx" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.httpcode_elb_5xx_silenced}"
+  silenced = "${var.httpcode_alb_5xx_silenced}"
 
   tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
 }
 
-resource "datadog_monitor" "ALB_httpcode_elb_4xx" {
+resource "datadog_monitor" "ALB_httpcode_4xx" {
   name    = "[${var.environment}] ALB HTTP code 4xx {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
-  message = "${coalesce(var.httpcode_elb_4xx_message, var.message)}"
+  message = "${coalesce(var.httpcode_alb_4xx_message, var.message)}"
 
   query = <<EOF
-    ${var.httpcode_elb_4xx_aggregator}(${var.httpcode_elb_4xx_timeframe}): (
+    sum(${var.httpcode_alb_4xx_timeframe}): (
       default(
-        ${var.httpcode_elb_4xx_aggregator}:aws.applicationelb.httpcode_elb_4xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
-        (${var.httpcode_elb_4xx_aggregator}:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
+        min:aws.applicationelb.httpcode_alb_4xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
+        (min:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
       0) * 100
-    ) > ${var.httpcode_elb_4xx_threshold_critical}
+    ) > ${var.httpcode_alb_4xx_threshold_critical}
   EOF
 
   evaluation_delay = "${var.delay}"
   new_host_delay   = "${var.delay}"
 
   thresholds {
-    critical = "${var.httpcode_elb_4xx_threshold_critical}"
-    warning  = "${var.httpcode_elb_4xx_threshold_warning}"
+    critical = "${var.httpcode_alb_4xx_threshold_critical}"
+    warning  = "${var.httpcode_alb_4xx_threshold_warning}"
   }
 
   notify_no_data      = false
@@ -128,7 +128,7 @@ resource "datadog_monitor" "ALB_httpcode_elb_4xx" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.httpcode_elb_4xx_silenced}"
+  silenced = "${var.httpcode_alb_4xx_silenced}"
 
   tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
 }
@@ -139,10 +139,10 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" {
   message = "${coalesce(var.httpcode_target_5xx_message, var.message)}"
 
   query = <<EOF
-    ${var.httpcode_target_5xx_aggregator}(${var.httpcode_target_5xx_timeframe}): (
+    sum(${var.httpcode_target_5xx_timeframe}): (
       default(
-        ${var.httpcode_target_5xx_aggregator}:aws.applicationelb.httpcode_target_5xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
-        (${var.httpcode_target_5xx_aggregator}:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
+        min:aws.applicationelb.httpcode_target_5xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
+        (min:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.httpcode_target_5xx_threshold_critical}
   EOF
@@ -172,10 +172,10 @@ resource "datadog_monitor" "ALB_httpcode_target_4xx" {
   message = "${coalesce(var.httpcode_target_4xx_message, var.message)}"
 
   query = <<EOF
-    ${var.httpcode_target_4xx_aggregator}(${var.httpcode_target_4xx_timeframe}): (
+    sum(${var.httpcode_target_4xx_timeframe}): (
       default(
-        ${var.httpcode_target_4xx_aggregator}:aws.applicationelb.httpcode_target_4xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
-        (${var.httpcode_target_4xx_aggregator}:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
+        min:aws.applicationelb.httpcode_target_4xx{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() /
+        (min:aws.applicationelb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}.as_count() + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.httpcode_target_4xx_threshold_critical}
   EOF
diff --git a/cloud/aws/apigateway/README.md b/cloud/aws/apigateway/README.md
index 54e1138..63e8b9b 100644
--- a/cloud/aws/apigateway/README.md
+++ b/cloud/aws/apigateway/README.md
@@ -31,19 +31,17 @@ Inputs
 | delay | Delay in seconds for the metric evaluation | string | `900` | no |
 | environment | Environment | string | - | yes |
 | filter_tags | Tags used for filtering | string | `*` | no |
-| http_4xx_requests_aggregator | Monitor aggregator for API Gateway HTTP 4xx requests [available values: min, max, sum or avg] | string | `min` | no |
 | http_4xx_requests_message | Custom message for API Gateway HTTP 4xx requests monitor | string | `` | no |
 | http_4xx_requests_silenced | Groups to mute for API Gateway HTTP 4xx requests monitor | map | `<map>` | no |
 | http_4xx_requests_threshold_critical | Maximum critical acceptable percent of 4xx errors | string | `30` | no |
 | http_4xx_requests_threshold_warning | Maximum warning acceptable percent of 4xx errors | string | `15` | no |
 | http_4xx_requests_timeframe | Monitor timeframe for API HTTP 4xx requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| http_5xx_requests_aggregator | Monitor aggregator for API Gateway HTTP 5xx requests [available values: min, max, sum or avg] | string | `min` | no |
 | http_5xx_requests_message | Custom message for API Gateway HTTP 5xx requests monitor | string | `` | no |
 | http_5xx_requests_silenced | Groups to mute for API Gateway HTTP 5xx requests monitor | map | `<map>` | no |
 | http_5xx_requests_threshold_critical | Maximum critical acceptable percent of 5xx errors | string | `20` | no |
 | http_5xx_requests_threshold_warning | Maximum warning acceptable percent of 5xx errors | string | `10` | no |
 | http_5xx_requests_timeframe | Monitor timeframe for API HTTP 5xx requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| latency_aggregator | Monitor aggregator for API Gateway latency [available values: min, max, sum or avg] | string | `max` | no |
+| latency_time_aggregator | Monitor aggregator for API Gateway latency [available values: min, max or avg] | string | `min` | no |
 | latency_message | Custom message for API Gateway latency monitor | string | `` | no |
 | latency_silenced | Groups to mute for API Gateway latency monitor | map | `<map>` | no |
 | latency_threshold_critical | Alerting threshold in milliseconds | string | `800` | no |
diff --git a/cloud/aws/apigateway/inputs.tf b/cloud/aws/apigateway/inputs.tf
index 461fd1c..1430ab5 100644
--- a/cloud/aws/apigateway/inputs.tf
+++ b/cloud/aws/apigateway/inputs.tf
@@ -33,8 +33,8 @@ variable "latency_message" {
   default     = ""
 }
 
-variable "latency_aggregator" {
-  description = "Monitor aggregator for API Gateway latency [available values: min, max, sum or avg]"
+variable "latency_time_aggregator" {
+  description = "Monitor aggregator for API Gateway latency [available values: min, max or avg]"
   type        = "string"
   default     = "min"
 }
@@ -71,12 +71,6 @@ variable "http_5xx_requests_message" {
   default     = ""
 }
 
-variable "http_5xx_requests_aggregator" {
-  description = "Monitor aggregator for API Gateway HTTP 5xx requests [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "http_5xx_requests_timeframe" {
   description = "Monitor timeframe for API HTTP 5xx requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
@@ -109,12 +103,6 @@ variable "http_4xx_requests_message" {
   default     = ""
 }
 
-variable "http_4xx_requests_aggregator" {
-  description = "Monitor aggregator for API Gateway HTTP 4xx requests [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "http_4xx_requests_timeframe" {
   description = "Monitor timeframe for API HTTP 4xx requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf
index 602fdfd..a7ff9cd 100644
--- a/cloud/aws/apigateway/monitors-api.tf
+++ b/cloud/aws/apigateway/monitors-api.tf
@@ -5,8 +5,8 @@ resource "datadog_monitor" "API_Gateway_latency" {
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOF
-    ${var.latency_aggregator}(${var.latency_timeframe}): (
-      ${var.latency_aggregator}:aws.apigateway.latency{${var.filter_tags}} by {region,apiname}
+    ${var.latency_time_aggregator}(${var.latency_timeframe}): (
+      min:aws.apigateway.latency{${var.filter_tags}} by {region,apiname}
     ) > ${var.latency_threshold_critical}
   EOF
 
@@ -36,10 +36,10 @@ resource "datadog_monitor" "API_http_5xx_errors_count" {
   message = "${coalesce(var.http_5xx_requests_message, var.message)}"
 
   query = <<EOF
-    ${var.http_5xx_requests_aggregator}(${var.http_5xx_requests_timeframe}): (
+    sum(${var.http_5xx_requests_timeframe}): (
       default(
-        ${var.http_5xx_requests_aggregator}:aws.apigateway.5xxerror{${var.filter_tags}} by {region,apiname}.as_count() /
-        (${var.http_5xx_requests_aggregator}:aws.apigateway.count{${var.filter_tags}} by {region,apiname}.as_count() + ${var.artificial_requests_count}),
+        min:aws.apigateway.5xxerror{${var.filter_tags}} by {region,apiname}.as_count() /
+        (min:aws.apigateway.count{${var.filter_tags}} by {region,apiname}.as_count() + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.http_5xx_requests_threshold_critical}
   EOF
@@ -70,10 +70,10 @@ resource "datadog_monitor" "API_http_4xx_errors_count" {
   message = "${coalesce(var.http_4xx_requests_message, var.message)}"
 
   query = <<EOF
-    ${var.http_4xx_requests_aggregator}(${var.http_4xx_requests_timeframe}): (
+    sum(${var.http_4xx_requests_timeframe}): (
       default(
-        ${var.http_4xx_requests_aggregator}:aws.apigateway.4xxerror{${var.filter_tags}} by {region,apiname}.as_count() /
-        (${var.http_4xx_requests_aggregator}:aws.apigateway.count{${var.filter_tags}} by {region,apiname}.as_count() + ${var.artificial_requests_count}),
+        min:aws.apigateway.4xxerror{${var.filter_tags}} by {region,apiname}.as_count() /
+        (min:aws.apigateway.count{${var.filter_tags}} by {region,apiname}.as_count() + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.http_4xx_requests_threshold_critical}
   EOF
diff --git a/cloud/aws/elasticsearch/README.md b/cloud/aws/elasticsearch/README.md
index 65015e6..641adac 100644
--- a/cloud/aws/elasticsearch/README.md
+++ b/cloud/aws/elasticsearch/README.md
@@ -29,23 +29,23 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| cpu_aggregator | Monitor aggregator for ES cluster cpu [available values: min, max, sum or avg] | string | `avg` | no |
 | cpu_message | Custom message for ES cluster cpu monitor | string | `` | no |
 | cpu_silenced | Groups to mute for ES cluster cpu monitor | map | `<map>` | no |
 | cpu_threshold_critical | CPU usage in percent (critical threshold) | string | `90` | no |
 | cpu_threshold_warning | CPU usage in percent (warning threshold) | string | `80` | no |
+| cpu_time_aggregator | Monitor aggregator for ES cluster cpu [available values: min, max or avg] | string | `avg` | no |
 | cpu_timeframe | Monitor timeframe for ES cluster cpu [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no |
 | delay | Delay in seconds for the metric evaluation | string | `900` | no |
-| diskspace_aggregator | Monitor aggregator for ES cluster diskspace [available values: min, max, sum or avg] | string | `avg` | no |
 | diskspace_message | Custom message for ES cluster diskspace monitor | string | `` | no |
 | diskspace_silenced | Groups to mute for ES cluster diskspace monitor | map | `<map>` | no |
 | diskspace_threshold_critical | Disk free space in percent (critical threshold) | string | `10` | no |
 | diskspace_threshold_warning | Disk free space in percent (warning threshold) | string | `20` | no |
+| diskspace_time_aggregator | Monitor aggregator for ES cluster diskspace [available values: min, max or avg] | string | `avg` | no |
 | diskspace_timeframe | Monitor timeframe for ES cluster diskspace [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no |
 | environment | Architecture Environment | string | - | yes |
-| es_cluster_status_aggregator | Monitor aggregator for ES cluster status [available values: min, max, sum or avg] | string | `max` | no |
 | es_cluster_status_message | Custom message for ES cluster status monitor | string | `` | no |
 | es_cluster_status_silenced | Groups to mute for ES cluster status monitor | map | `<map>` | no |
+| es_cluster_status_time_aggregator | Monitor aggregator for ES cluster status [available values: min, max or avg] | string | `max` | no |
 | es_cluster_status_timeframe | Monitor timeframe for ES cluster status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_30m` | no |
 | es_cluster_volume_size | ElasticSearch Domain volume size (in GB) | string | - | yes |
 | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
diff --git a/cloud/aws/elasticsearch/inputs.tf b/cloud/aws/elasticsearch/inputs.tf
index ee010a1..3f1a3e3 100644
--- a/cloud/aws/elasticsearch/inputs.tf
+++ b/cloud/aws/elasticsearch/inputs.tf
@@ -38,8 +38,8 @@ variable "es_cluster_status_message" {
   default     = ""
 }
 
-variable "es_cluster_status_aggregator" {
-  description = "Monitor aggregator for ES cluster status [available values: min, max, sum or avg]"
+variable "es_cluster_status_time_aggregator" {
+  description = "Monitor aggregator for ES cluster status [available values: min, max or avg]"
   type        = "string"
   default     = "max"
 }
@@ -66,8 +66,8 @@ variable "diskspace_message" {
   default     = ""
 }
 
-variable "diskspace_aggregator" {
-  description = "Monitor aggregator for ES cluster diskspace [available values: min, max, sum or avg]"
+variable "diskspace_time_aggregator" {
+  description = "Monitor aggregator for ES cluster diskspace [available values: min, max or avg]"
   type        = "string"
   default     = "avg"
 }
@@ -100,8 +100,8 @@ variable "cpu_message" {
   default     = ""
 }
 
-variable "cpu_aggregator" {
-  description = "Monitor aggregator for ES cluster cpu [available values: min, max, sum or avg]"
+variable "cpu_time_aggregator" {
+  description = "Monitor aggregator for ES cluster cpu [available values: min, max or avg]"
   type        = "string"
   default     = "avg"
 }
diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
index 309e0a7..3f51e75 100644
--- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf
+++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
@@ -18,9 +18,9 @@ resource "datadog_monitor" "es_cluster_status" {
   type = "metric alert"
 
   query = <<EOF
-  ${var.es_cluster_status_aggregator}(${var.es_cluster_status_timeframe}): (
-    ${var.es_cluster_status_aggregator}:aws.es.cluster_statusred{${data.template_file.filter.rendered}} by {region,name} * 2 +
-    (${var.es_cluster_status_aggregator}:aws.es.cluster_statusyellow{${data.template_file.filter.rendered}} by {region,name} + 0.1)
+  ${var.es_cluster_status_time_aggregator}(${var.es_cluster_status_timeframe}): (
+    avg:aws.es.cluster_statusred{${data.template_file.filter.rendered}} by {region,name} * 2 +
+    (avg:aws.es.cluster_statusyellow{${data.template_file.filter.rendered}} by {region,name} + 0.1)
   ) >= 2
 EOF
 
@@ -52,8 +52,8 @@ resource "datadog_monitor" "es_free_space_low" {
   type = "metric alert"
 
   query = <<EOF
-  ${var.diskspace_aggregator}(${var.diskspace_timeframe}): (
-    ${var.diskspace_aggregator}:aws.es.free_storage_space{${data.template_file.filter.rendered}} by {region,name} /
+  ${var.diskspace_time_aggregator}(${var.diskspace_timeframe}): (
+    avg:aws.es.free_storage_space{${data.template_file.filter.rendered}} by {region,name} /
     (${var.es_cluster_volume_size}*1000) * 100
   ) < ${var.diskspace_threshold_critical}
 EOF
@@ -86,8 +86,8 @@ resource "datadog_monitor" "es_cpu_90_15min" {
   type = "metric alert"
 
   query = <<EOF
-  ${var.cpu_aggregator}(${var.cpu_timeframe}): (
-    ${var.cpu_aggregator}:aws.es.cpuutilization{${data.template_file.filter.rendered}} by {region,name}
+  ${var.cpu_time_aggregator}(${var.cpu_timeframe}): (
+    avg:aws.es.cpuutilization{${data.template_file.filter.rendered}} by {region,name}
   ) > ${var.cpu_threshold_critical}
 EOF
 
diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md
index ab30a8b..f39031d 100644
--- a/cloud/aws/elb/README.md
+++ b/cloud/aws/elb/README.md
@@ -32,37 +32,33 @@ Inputs
 |------|-------------|:----:|:-----:|:-----:|
 | artificial_requests_count | Number of false requests used to mitigate false positive in case of low trafic | string | `5` | no |
 | delay | Delay in seconds for the metric evaluation | string | `900` | no |
-| elb_4xx_aggregator | Monitor aggregator for ELB 4xx errors [available values: min, max, sum or avg] | string | `min` | no |
 | elb_4xx_message | Custom message for ELB 4xx errors monitor | string | `` | no |
 | elb_4xx_silenced | Groups to mute for ELB 4xx errors monitor | map | `<map>` | no |
 | elb_4xx_threshold_critical | loadbalancer 4xx critical threshold in percentage | string | `10` | no |
 | elb_4xx_threshold_warning | loadbalancer 4xx warning threshold in percentage | string | `5` | no |
 | elb_4xx_timeframe | Monitor timeframe for ELB 4xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| elb_5xx_aggregator | Monitor aggregator for ELB 5xx errors [available values: min, max, sum or avg] | string | `min` | no |
 | elb_5xx_message | Custom message for ELB 5xx errors monitor | string | `` | no |
 | elb_5xx_silenced | Groups to mute for ELB 5xx errors monitor | map | `<map>` | no |
 | elb_5xx_threshold_critical | loadbalancer 5xx critical threshold in percentage | string | `10` | no |
 | elb_5xx_threshold_warning | loadbalancer 5xx warning threshold in percentage | string | `5` | no |
 | elb_5xx_timeframe | Monitor timeframe for ELB 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| elb_backend_4xx_aggregator | Monitor aggregator for ELB backend 4xx errors [available values: min, max, sum or avg] | string | `min` | no |
 | elb_backend_4xx_message | Custom message for ELB backend 4xx errors monitor | string | `` | no |
 | elb_backend_4xx_silenced | Groups to mute for ELB backend 4xx errors monitor | map | `<map>` | no |
 | elb_backend_4xx_threshold_critical | loadbalancer backend 4xx critical threshold in percentage | string | `10` | no |
 | elb_backend_4xx_threshold_warning | loadbalancer backend 4xx warning threshold in percentage | string | `5` | no |
 | elb_backend_4xx_timeframe | Monitor timeframe for ELB backend 4xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| elb_backend_5xx_aggregator | Monitor aggregator for ELB backend 5xx errors [available values: min, max, sum or avg] | string | `min` | no |
 | elb_backend_5xx_message | Custom message for ELB backend 5xx errors monitor | string | `` | no |
 | elb_backend_5xx_silenced | Groups to mute for ELB backend 5xx errors monitor | map | `<map>` | no |
 | elb_backend_5xx_threshold_critical | loadbalancer backend 5xx critical threshold in percentage | string | `10` | no |
 | elb_backend_5xx_threshold_warning | loadbalancer backend 5xx warning threshold in percentage | string | `5` | no |
 | elb_backend_5xx_timeframe | Monitor timeframe for ELB backend 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
-| elb_backend_latency_aggregator | Monitor aggregator for ELB backend latency [available values: min, max, sum or avg] | string | `max` | no |
+| elb_backend_latency_time_aggregator | Monitor aggregator for ELB backend latency [available values: min, max or avg] | string | `min` | no |
 | elb_backend_latency_critical | latency critical threshold in seconds | string | `5` | no |
 | elb_backend_latency_message | Custom message for ELB backend latency monitor | string | `` | no |
 | elb_backend_latency_silenced | Groups to mute for ELB backend latency monitor | map | `<map>` | no |
 | elb_backend_latency_timeframe | Monitor timeframe for ELB backend latency [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | elb_backend_latency_warning | latency warning threshold in seconds | string | `1` | no |
-| elb_no_healthy_instance_aggregator | Monitor aggregator for ELB no healty instance [available values: min, max, sum or avg] | string | `min` | no |
+| elb_no_healthy_instance_time_aggregator | Monitor aggregator for ELB no healty instance [available values: min, max or avg] | string | `min` | no |
 | elb_no_healthy_instance_message | Custom message for ELB no healty instance monitor | string | `` | no |
 | elb_no_healthy_instance_silenced | Groups to mute for ELB no healty instance monitor | map | `<map>` | no |
 | elb_no_healthy_instance_timeframe | Monitor timeframe for ELB no healty instance [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf
index d311ca3..b0f2e80 100644
--- a/cloud/aws/elb/inputs.tf
+++ b/cloud/aws/elb/inputs.tf
@@ -37,8 +37,8 @@ variable "elb_no_healthy_instance_message" {
   default     = ""
 }
 
-variable "elb_no_healthy_instance_aggregator" {
-  description = "Monitor aggregator for ELB no healty instance [available values: min, max, sum or avg]"
+variable "elb_no_healthy_instance_time_aggregator" {
+  description = "Monitor aggregator for ELB no healty instance [available values: min or max]"
   type        = "string"
   default     = "min"
 }
@@ -61,12 +61,6 @@ variable "elb_4xx_message" {
   default     = ""
 }
 
-variable "elb_4xx_aggregator" {
-  description = "Monitor aggregator for ELB 4xx errors [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "elb_4xx_timeframe" {
   description = "Monitor timeframe for ELB 4xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
@@ -95,12 +89,6 @@ variable "elb_5xx_message" {
   default     = ""
 }
 
-variable "elb_5xx_aggregator" {
-  description = "Monitor aggregator for ELB 5xx errors [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "elb_5xx_timeframe" {
   description = "Monitor timeframe for ELB 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
@@ -129,12 +117,6 @@ variable "elb_backend_4xx_message" {
   default     = ""
 }
 
-variable "elb_backend_4xx_aggregator" {
-  description = "Monitor aggregator for ELB backend 4xx errors [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "elb_backend_4xx_timeframe" {
   description = "Monitor timeframe for ELB backend 4xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
@@ -163,12 +145,6 @@ variable "elb_backend_5xx_message" {
   default     = ""
 }
 
-variable "elb_backend_5xx_aggregator" {
-  description = "Monitor aggregator for ELB backend 5xx errors [available values: min, max, sum or avg]"
-  type        = "string"
-  default     = "sum"
-}
-
 variable "elb_backend_5xx_timeframe" {
   description = "Monitor timeframe for ELB backend 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
@@ -197,8 +173,8 @@ variable "elb_backend_latency_message" {
   default     = ""
 }
 
-variable "elb_backend_latency_aggregator" {
-  description = "Monitor aggregator for ELB backend latency [available values: min, max, sum or avg]"
+variable "elb_backend_latency_time_aggregator" {
+  description = "Monitor aggregator for ELB backend latency [available values: min, max or avg]"
   type        = "string"
   default     = "min"
 }
diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf
index 1390137..ed92f6b 100644
--- a/cloud/aws/elb/monitors-elb.tf
+++ b/cloud/aws/elb/monitors-elb.tf
@@ -11,8 +11,8 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
   message = "${coalesce(var.elb_no_healthy_instance_message, var.message)}"
 
   query = <<EOF
-    ${var.elb_no_healthy_instance_aggregator}(${var.elb_no_healthy_instance_timeframe}): (
-      ${var.elb_no_healthy_instance_aggregator}:aws.elb.healthy_host_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
+    ${var.elb_no_healthy_instance_time_aggregator}(${var.elb_no_healthy_instance_timeframe}): (
+      min:aws.elb.healthy_host_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) < 1
   EOF
 
@@ -38,10 +38,10 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
   message = "${coalesce(var.elb_4xx_message, var.message)}"
 
   query = <<EOF
-    ${var.elb_4xx_aggregator}(${var.elb_4xx_timeframe}): (
+    sum(${var.elb_4xx_timeframe}): (
       default(
-        ${var.elb_4xx_aggregator}:aws.elb.httpcode_elb_4xx{${data.template_file.filter.rendered}} by {region,loadbalancername}.as_count() /
-        (${var.elb_4xx_aggregator}:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername}.as_count() + ${var.artificial_requests_count}),
+        min:aws.elb.httpcode_elb_4xx{${data.template_file.filter.rendered}} by {region,loadbalancername}.as_count() /
+        (min:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername}.as_count() + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.elb_4xx_threshold_critical}
   EOF
@@ -73,10 +73,10 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
   message = "${coalesce(var.elb_5xx_message, var.message)}"
 
   query = <<EOF
-    ${var.elb_5xx_aggregator}(${var.elb_5xx_timeframe}): (
+    sum(${var.elb_5xx_timeframe}): (
       default(
-        ${var.elb_5xx_aggregator}:aws.elb.httpcode_elb_5xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
-        (${var.elb_5xx_aggregator}:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername} + ${var.artificial_requests_count}),
+        min:aws.elb.httpcode_elb_5xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+        (min:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername} + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.elb_5xx_threshold_critical}
   EOF
@@ -108,10 +108,10 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
   message = "${coalesce(var.elb_backend_4xx_message, var.message)}"
 
   query = <<EOF
-    ${var.elb_backend_4xx_aggregator}(${var.elb_backend_4xx_timeframe}): (
+    sum(${var.elb_backend_4xx_timeframe}): (
       default(
-        ${var.elb_backend_4xx_aggregator}:aws.elb.httpcode_backend_4xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
-        (${var.elb_backend_4xx_aggregator}:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername} + ${var.artificial_requests_count}),
+        min:aws.elb.httpcode_backend_4xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+        (min:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername} + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.elb_backend_4xx_threshold_critical}
   EOF
@@ -143,10 +143,10 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
   message = "${coalesce(var.elb_backend_5xx_message, var.message)}"
 
   query = <<EOF
-    ${var.elb_backend_5xx_aggregator}(${var.elb_backend_5xx_timeframe}): (
+    sum(${var.elb_backend_5xx_timeframe}): (
       default(
-        ${var.elb_backend_5xx_aggregator}:aws.elb.httpcode_backend_5xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
-        (${var.elb_backend_5xx_aggregator}:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername} + ${var.artificial_requests_count}),
+        min:aws.elb.httpcode_backend_5xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+        (min:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername} + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.elb_backend_5xx_threshold_critical}
   EOF
@@ -178,8 +178,8 @@ resource "datadog_monitor" "ELB_backend_latency" {
   message = "${coalesce(var.elb_backend_latency_message, var.message)}"
 
   query = <<EOF
-    ${var.elb_backend_latency_aggregator}(${var.elb_backend_latency_warning}): (
-        ${var.elb_backend_latency_aggregator}:aws.elb.latency{${data.template_file.filter.rendered}} by {region,loadbalancername}
+    ${var.elb_backend_latency_time_aggregator}(${var.elb_backend_latency_warning}): (
+        min:aws.elb.latency{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) > ${var.elb_backend_latency_critical}
   EOF
 
diff --git a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
index 1f1a71b..7d73d6d 100644
--- a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
+++ b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
@@ -14,10 +14,10 @@ resource "datadog_monitor" "firehose_incoming_records" {
   type = "metric alert"
 
   query = <<EOF
-  sum(${var.incoming_records_timeframe}): (
-    avg:aws.firehose.incoming_records{${data.template_file.filter.rendered}} by {region,deliverystreamname}
-  ) <= 0
-EOF
+    sum(${var.incoming_records_timeframe}): (
+      avg:aws.firehose.incoming_records{${data.template_file.filter.rendered}} by {region,deliverystreamname}
+    ) <= 0
+  EOF
 
   thresholds {
     critical = 0
diff --git a/cloud/aws/rds/README.md b/cloud/aws/rds/README.md
index d6b79e0..740e4d2 100644
--- a/cloud/aws/rds/README.md
+++ b/cloud/aws/rds/README.md
@@ -25,14 +25,14 @@ Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| cpu_aggregator | Monitor aggregator for RDS CPU usage [available values: min, max, sum or avg] | string | `avg` | no |
+| cpu_time_aggregator | Monitor aggregator for RDS CPU usage [available values: min, max or avg] | string | `avg` | no |
 | cpu_message | Custom message for RDS CPU usage monitor | string | `` | no |
 | cpu_silenced | Groups to mute for RDS CPU usage monitor | map | `<map>` | no |
 | cpu_threshold_critical | CPU usage in percent (critical threshold) | string | `90` | no |
 | cpu_threshold_warning | CPU usage in percent (warning threshold) | string | `80` | no |
 | cpu_timeframe | Monitor timeframe for RDS CPU usage [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no |
 | delay | Delay in seconds for the metric evaluation | string | `900` | no |
-| diskspace_aggregator | Monitor aggregator for RDS free diskspace [available values: min, max, sum or avg] | string | `avg` | no |
+| diskspace_time_aggregator | Monitor aggregator for RDS free diskspace [available values: min, max or avg] | string | `avg` | no |
 | diskspace_message | Custom message for RDS free diskspace monitor | string | `` | no |
 | diskspace_silenced | Groups to mute for RDS free diskspace monitor | map | `<map>` | no |
 | diskspace_threshold_critical | Disk free space in percent (critical threshold) | string | `10` | no |
diff --git a/cloud/aws/rds/inputs.tf b/cloud/aws/rds/inputs.tf
index e54b16d..747a1a3 100644
--- a/cloud/aws/rds/inputs.tf
+++ b/cloud/aws/rds/inputs.tf
@@ -38,8 +38,8 @@ variable "cpu_message" {
   default     = ""
 }
 
-variable "cpu_aggregator" {
-  description = "Monitor aggregator for RDS CPU usage [available values: min, max, sum or avg]"
+variable "cpu_time_aggregator" {
+  description = "Monitor aggregator for RDS CPU usage [available values: min, max or avg]"
   type        = "string"
   default     = "avg"
 }
@@ -72,8 +72,8 @@ variable "diskspace_message" {
   default     = ""
 }
 
-variable "diskspace_aggregator" {
-  description = "Monitor aggregator for RDS free diskspace [available values: min, max, sum or avg]"
+variable "diskspace_time_aggregator" {
+  description = "Monitor aggregator for RDS free diskspace [available values: min, max or avg]"
   type        = "string"
   default     = "avg"
 }
diff --git a/cloud/aws/rds/monitors-rds.tf b/cloud/aws/rds/monitors-rds.tf
index 6c452be..550a041 100644
--- a/cloud/aws/rds/monitors-rds.tf
+++ b/cloud/aws/rds/monitors-rds.tf
@@ -14,8 +14,8 @@ resource "datadog_monitor" "rds_cpu_90_15min" {
   type = "metric alert"
 
   query = <<EOF
-    ${var.cpu_aggregator}(${var.cpu_timeframe}): (
-      ${var.cpu_aggregator}:aws.rds.cpuutilization{${data.template_file.filter.rendered}} by {region,name}
+    ${var.cpu_time_aggregator}(${var.cpu_timeframe}): (
+      avg:aws.rds.cpuutilization{${data.template_file.filter.rendered}} by {region,name}
     ) > ${var.cpu_threshold_critical}
 EOF
 
@@ -46,9 +46,9 @@ resource "datadog_monitor" "rds_free_space_low" {
   type = "metric alert"
 
   query = <<EOF
-  ${var.diskspace_aggregator}(${var.diskspace_timeframe}): (
-    ${var.diskspace_aggregator}:aws.rds.free_storage_space{${data.template_file.filter.rendered}} by {region,name} /
-    ${var.diskspace_aggregator}:aws.rds.total_storage_space{${data.template_file.filter.rendered}} by {region,name} * 100
+  ${var.diskspace_time_aggregator}(${var.diskspace_timeframe}): (
+    avg:aws.rds.free_storage_space{${data.template_file.filter.rendered}} by {region,name} /
+    avg:aws.rds.total_storage_space{${data.template_file.filter.rendered}} by {region,name} * 100
   ) < ${var.diskspace_threshold_critical}
 EOF
 
diff --git a/cloud/aws/vpn/README.md b/cloud/aws/vpn/README.md
index 3077bef..4be0db7 100644
--- a/cloud/aws/vpn/README.md
+++ b/cloud/aws/vpn/README.md
@@ -29,7 +29,7 @@ Inputs
 | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
 | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
 | message | Message sent when an alert is triggered | string | - | yes |
-| vpn_status_aggregator | Monitor aggregator for  VPN status [available values: min, max, sum or avg] | string | `avg` | no |
+| vpn_status_time_aggregator | Monitor aggregator for  VPN status [available values: min, max or avg] | string | `avg` | no |
 | vpn_status_message | Custom message for VPN status monitor | string | `` | no |
 | vpn_status_silenced | Groups to mute for VPN status monitor | map | `<map>` | no |
 | vpn_status_timeframe | Monitor timeframe for VPN status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
diff --git a/cloud/aws/vpn/inputs.tf b/cloud/aws/vpn/inputs.tf
index a95f500..c1a0969 100644
--- a/cloud/aws/vpn/inputs.tf
+++ b/cloud/aws/vpn/inputs.tf
@@ -36,8 +36,8 @@ variable "vpn_status_message" {
   default     = ""
 }
 
-variable "vpn_status_aggregator" {
-  description = "Monitor aggregator for VPN status [available values: min, max, sum or avg]"
+variable "vpn_status_time_aggregator" {
+  description = "Monitor aggregator for VPN status [available values: min, max or avg]"
   type        = "string"
   default     = "avg"
 }
diff --git a/cloud/aws/vpn/monitors-vpn.tf b/cloud/aws/vpn/monitors-vpn.tf
index 63c2a89..3327573 100644
--- a/cloud/aws/vpn/monitors-vpn.tf
+++ b/cloud/aws/vpn/monitors-vpn.tf
@@ -11,8 +11,8 @@ resource "datadog_monitor" "VPN_status" {
   message = "${coalesce(var.vpn_status_message, var.message)}"
 
   query = <<EOF
-        ${var.vpn_status_aggregator}(${var.vpn_status_timeframe}): (
-          ${var.vpn_status_aggregator}:aws.vpn.tunnel_state{${data.template_file.filter.rendered}} by {region,name}
+        ${var.vpn_status_time_aggregator}(${var.vpn_status_timeframe}): (
+          avg:aws.vpn.tunnel_state{${data.template_file.filter.rendered}} by {region,name}
         ) < 1
   EOF