diff --git a/middleware/apache/README.md b/middleware/apache/README.md
index 457a8b3..6c88f52 100644
--- a/middleware/apache/README.md
+++ b/middleware/apache/README.md
@@ -26,7 +26,7 @@ Creates DataDog monitors with the following checks:
 | apache\_connect\_extra\_tags | Extra tags for Apache process monitor | list | `[]` | no |
 | apache\_connect\_message | Custom message for Apache status monitor | string | `""` | no |
 | apache\_connect\_silenced | Groups to mute for Apache status monitor | map | `{}` | no |
-| apache\_connect\_threshold\_critical | Apache status monitor (critical threshold) | string | `"1.1754943508222875e-38"` | no |
+| apache\_connect\_threshold\_warning | Apache status monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture Environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
 | filter\_tags\_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `"*"` | no |
diff --git a/middleware/apache/inputs.tf b/middleware/apache/inputs.tf
index 498f00a..24544ad 100644
--- a/middleware/apache/inputs.tf
+++ b/middleware/apache/inputs.tf
@@ -60,8 +60,8 @@ variable "apache_connect_message" {
   default     = ""
 }
 
-variable "apache_connect_threshold_critical" {
-  description = "Apache status monitor (critical threshold)"
+variable "apache_connect_threshold_warning" {
+  description = "Apache status monitor (warning threshold)"
   type        = "string"
-  default     = "1.1754943508222875e-38"
+  default     = 3
 }
diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index a32273c..1404dea 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -6,12 +6,12 @@ resource "datadog_monitor" "datadog_apache_process" {
   type = "service check"
 
   query = <<EOF
-    "apache.can_connect"${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
+    "apache.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
   EOF
 
   thresholds = {
-    warning  = 0
-    critical = "${var.apache_connect_threshold_critical}"
+    warning  = "${var.apache_connect_threshold_warning}"
+    critical = 5
   }
 
   notify_no_data      = true