diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index c10508f..b1faa50 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -13,7 +13,7 @@ resource "datadog_monitor" "datadog_apache_process" {
   type = "service check"
 
   query = <<EOF
-    "apache.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
+    "apache.can_connect".over("${data.template_file.filter.rendered}").by("host","port").last(6).count_by_status()
   EOF
 
   thresholds = {
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index 5e45a41..75bb0e9 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -13,7 +13,7 @@ resource "datadog_monitor" "datadog_nginx_process" {
   type = "service check"
 
   query = <<EOF
-    "nginx.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
+    "nginx.can_connect".over("${data.template_file.filter.rendered}").by("host","port").last(6).count_by_status()
   EOF
 
   thresholds = {
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index b385eeb..a939c95 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -26,8 +26,8 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay_metric}"
-  new_host_delay      = "${var.delay_metric}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
@@ -46,7 +46,7 @@ resource "datadog_monitor" "datadog_fpm_process" {
   type = "service check"
 
   query = <<EOF
-    "php_fpm.can_ping".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
+    "php_fpm.can_ping".over("${data.template_file.filter.rendered}").by("host","port").last(6).count_by_status()
   EOF
 
   thresholds = {
@@ -56,8 +56,8 @@ resource "datadog_monitor" "datadog_fpm_process" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay_service}"
-  new_host_delay      = "${var.delay_service}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0