diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index 9447cb4..c42ad6c 100644
--- a/cloud/azure/app-services/monitors-app_services.tf
+++ b/cloud/azure/app-services/monitors-app_services.tf
@@ -13,7 +13,11 @@ resource "datadog_monitor" "appservices_response_time" {
   message            = "${var.message}"
   escalation_message = "${var.response_time_escalation_message}"
 
-  query = "avg(last_${var.response_time_last_time_window_code}):avg:azure.app_services.average_response_time{${data.template_file.filter.rendered}} >= ${var.response_time_threshold_critical}"
+  query = <<EOF
+    avg(last_${var.response_time_last_time_window_code}): (
+      avg:azure.app_services.average_response_time{${data.template_file.filter.rendered}}
+    ) >= ${var.response_time_threshold_critical}
+  EOF
 
   evaluation_delay = "${var.response_time_appserv_eval_delay}"
 
@@ -39,7 +43,11 @@ resource "datadog_monitor" "appservices_memory_usage_count" {
   message            = "${var.message}"
   escalation_message = "${var.memory_usage_escalation_message}"
 
-  query = "avg(last_${var.memory_usage_last_time_window_code}):avg:azure.app_services.memory_working_set{${data.template_file.filter.rendered}} >= ${var.memory_usage_threshold_critical}"
+  query = <<EOF
+    avg(last_${var.memory_usage_last_time_window_code}): (
+      avg:azure.app_services.memory_working_set{${data.template_file.filter.rendered}}
+    ) >= ${var.memory_usage_threshold_critical}
+  EOF
 
   evaluation_delay = "${var.memory_usage_appserv_eval_delay}"
 
@@ -65,7 +73,11 @@ resource "datadog_monitor" "appservices_http_404_errors_count" {
   message            = "${var.message}"
   escalation_message = "${var.http_404_errors_count_rate_escalation_message}"
 
-  query = "max(last_${var.http_404_errors_count_rate_last_time_window_code}):per_minute(avg:azure.app_services.http404{${data.template_file.filter.rendered}}.as_rate()) > ${var.http_404_errors_count_rate_threshold_critical}"
+  query = <<EOF
+    max(last_${var.http_404_errors_count_rate_last_time_window_code}): (
+      per_minute(avg:azure.app_services.http404{${data.template_file.filter.rendered}}.as_rate())
+    ) > ${var.http_404_errors_count_rate_threshold_critical}
+  EOF
 
   evaluation_delay = "${var.http_404_errors_count_rate_appserv_eval_delay}"
 
@@ -91,7 +103,13 @@ resource "datadog_monitor" "appservices_http_2xx_status_rate" {
   message            = "${var.message}"
   escalation_message = "${var.http_2xx_status_rate_escalation_message}"
 
-  query            = "avg(last_${var.http_2xx_status_rate_last_time_window_code}):avg:azure.app_services.http2xx{${data.template_file.filter.rendered}}.as_count() / avg:azure.app_services.http2xx{${data.template_file.filter.rendered}}.as_count() < ${var.http_2xx_status_rate_threshold_critical}"
+  query            = <<EOF
+    avg(last_${var.http_2xx_status_rate_last_time_window_code}): (
+      avg:azure.app_services.http2xx{${data.template_file.filter.rendered}}.as_count() /
+        avg:azure.app_services.http2xx{${data.template_file.filter.rendered}}.as_count()
+    ) < ${var.http_2xx_status_rate_threshold_critical}
+  EOF
+
   evaluation_delay = "${var.http_2xx_status_rate_appserv_eval_delay}"
 
   thresholds {