diff --git a/caas/kubernetes/cluster/monitors-k8s-cluster.tf b/caas/kubernetes/cluster/monitors-k8s-cluster.tf
index f045cea..4450a86 100644
--- a/caas/kubernetes/cluster/monitors-k8s-cluster.tf
+++ b/caas/kubernetes/cluster/monitors-k8s-cluster.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "apiserver" {
   type = "service check"
 
   query = <<EOQ
-    "kube_apiserver_controlplane.up"${module.filter-tags.service_check}.by("apiserver_name").last(6).count_by_status()
+    "kube_apiserver_controlplane.up"${module.filter-tags.service_check}.last(6).count_by_status()
   EOQ
 
   thresholds = {