diff --git a/caas/kubernetes/node/monitors-k8s-node.tf b/caas/kubernetes/node/monitors-k8s-node.tf
index 21f73ff..f9712b0 100644
--- a/caas/kubernetes/node/monitors-k8s-node.tf
+++ b/caas/kubernetes/node/monitors-k8s-node.tf
@@ -5,7 +5,7 @@ resource "datadog_monitor" "disk_pressure" {
   type    = "service check"
 
   query = <<EOQ
-    "kubernetes_state.node.disk_pressure"${module.filter-tags.service_check}.by("kubernetescluster","node").last(6).count_by_status()
+    "kubernetes_state.node.disk_pressure"${module.filter-tags.service_check}.by("node").last(6).count_by_status()
 EOQ
 
   thresholds = {
@@ -36,7 +36,7 @@ resource "datadog_monitor" "disk_out" {
   type    = "service check"
 
   query = <<EOQ
-    "kubernetes_state.node.out_of_disk"${module.filter-tags.service_check}.by("kubernetescluster","node").last(6).count_by_status()
+    "kubernetes_state.node.out_of_disk"${module.filter-tags.service_check}.by("node").last(6).count_by_status()
 EOQ
 
   thresholds = {
@@ -67,7 +67,7 @@ resource "datadog_monitor" "memory_pressure" {
   type    = "service check"
 
   query = <<EOQ
-    "kubernetes_state.node.memory_pressure"${module.filter-tags.service_check}.by("kubernetescluster","node").last(6).count_by_status()
+    "kubernetes_state.node.memory_pressure"${module.filter-tags.service_check}.by("node").last(6).count_by_status()
 EOQ
 
   thresholds = {
@@ -98,7 +98,7 @@ resource "datadog_monitor" "ready" {
   type    = "service check"
 
   query = <<EOQ
-    "kubernetes_state.node.ready"${module.filter-tags.service_check}.by("kubernetescluster","node").last(6).count_by_status()
+    "kubernetes_state.node.ready"${module.filter-tags.service_check}.by("node").last(6).count_by_status()
 EOQ
 
   thresholds = {
@@ -129,7 +129,7 @@ resource "datadog_monitor" "kubelet_ping" {
   type    = "service check"
 
   query = <<EOQ
-    "kubernetes.kubelet.check.ping"${module.filter-tags.service_check}.by("kubernetescluster","name").last(6).count_by_status()
+    "kubernetes.kubelet.check.ping"${module.filter-tags.service_check}.by("name").last(6).count_by_status()
 EOQ
 
   thresholds = {
@@ -160,7 +160,7 @@ resource "datadog_monitor" "kubelet_syncloop" {
   type    = "service check"
 
   query = <<EOQ
-    "kubernetes.kubelet.check.syncloop"${module.filter-tags.service_check}.by("kubernetescluster","name").last(6).count_by_status()
+    "kubernetes.kubelet.check.syncloop"${module.filter-tags.service_check}.by("name").last(6).count_by_status()
 EOQ
 
   thresholds = {
@@ -217,7 +217,7 @@ resource "datadog_monitor" "node_unschedulable" {
 
   query = <<EOQ
     ${var.node_unschedulable_time_aggregator}(${var.node_unschedulable_timeframe}):
-      sum:kubernetes_state.node.status${module.filter-tags-unschedulable.query_alert} by {kubernetescluster,node}
+      sum:kubernetes_state.node.status${module.filter-tags-unschedulable.query_alert} by {node}
     > 0
 EOQ
 
@@ -250,8 +250,8 @@ resource "datadog_monitor" "volume_space" {
 
   query = <<EOQ
     ${var.volume_space_time_aggregator}(${var.volume_space_timeframe}):
-      avg:kubernetes.kubelet.volume.stats.used_bytes${module.filter-tags.query_alert} by {kubernetescluster,name,persistentvolumeclaim} /
-      avg:kubernetes.kubelet.volume.stats.capacity_bytes${module.filter-tags.query_alert} by {kubernetescluster,name,persistentvolumeclaim}
+      avg:kubernetes.kubelet.volume.stats.used_bytes${module.filter-tags.query_alert} by {name,persistentvolumeclaim} /
+      avg:kubernetes.kubelet.volume.stats.capacity_bytes${module.filter-tags.query_alert} by {name,persistentvolumeclaim}
     * 100 > ${var.volume_space_threshold_critical}
 EOQ
 
@@ -285,8 +285,8 @@ resource "datadog_monitor" "volume_inodes" {
 
   query = <<EOQ
     ${var.volume_inodes_time_aggregator}(${var.volume_inodes_timeframe}):
-      avg:kubernetes.kubelet.volume.stats.inodes_used${module.filter-tags.query_alert} by {kubernetescluster,name,persistentvolumeclaim} /
-      avg:kubernetes.kubelet.volume.stats.inodes${module.filter-tags.query_alert} by {kubernetescluster,name,persistentvolumeclaim}
+      avg:kubernetes.kubelet.volume.stats.inodes_used${module.filter-tags.query_alert} by {name,persistentvolumeclaim} /
+      avg:kubernetes.kubelet.volume.stats.inodes${module.filter-tags.query_alert} by {name,persistentvolumeclaim}
     * 100 > ${var.volume_inodes_threshold_critical}
 EOQ