diff --git a/cloud/aws/elasticache/common/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf
index 2a908e5..efe4dfd 100644
--- a/cloud/aws/elasticache/common/monitors-elasticache.tf
+++ b/cloud/aws/elasticache/common/monitors-elasticache.tf
@@ -7,7 +7,7 @@ resource "datadog_monitor" "elasticache_eviction" {
 
   query = <<EOF
     sum(${var.eviction_timeframe}): (
-      avg:aws.elasticache.evictions${module.filter-tags.query_alert} by {region,cacheclusterid}
+      avg:aws.elasticache.evictions${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) > ${var.eviction_threshold_critical}
   EOF
 
@@ -40,7 +40,7 @@ resource "datadog_monitor" "elasticache_max_connection" {
 
   query = <<EOF
     ${var.max_connection_time_aggregator}(${var.max_connection_timeframe}): (
-      avg:aws.elasticache.curr_connections${module.filter-tags.query_alert} by {region,cacheclusterid}
+      avg:aws.elasticache.curr_connections${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) >= 65000
   EOF
 
@@ -68,7 +68,7 @@ resource "datadog_monitor" "elasticache_no_connection" {
 
   query = <<EOF
     ${var.no_connection_time_aggregator}(${var.no_connection_timeframe}): (
-      avg:aws.elasticache.curr_connections${module.filter-tags.query_alert} by {region,cacheclusterid}
+      avg:aws.elasticache.curr_connections${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) <= 0
   EOF
 
@@ -96,7 +96,7 @@ resource "datadog_monitor" "elasticache_swap" {
 
   query = <<EOF
     ${var.swap_time_aggregator}(${var.swap_timeframe}): (
-      avg:aws.elasticache.swap_usage${module.filter-tags.query_alert} by {region,cacheclusterid}
+      avg:aws.elasticache.swap_usage${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) > ${var.swap_threshold_critical}
   EOF
 
@@ -163,7 +163,7 @@ resource "datadog_monitor" "elasticache_eviction_growing" {
 
   query = <<EOF
     pct_change(avg(${var.eviction_growing_timeframe}),${var.eviction_growing_condition_timeframe}):
-      avg:aws.elasticache.evictions${module.filter-tags.query_alert} by {region,cacheclusterid}
+      avg:aws.elasticache.evictions${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     > ${var.eviction_growing_threshold_critical}
   EOF
 
diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index 6c86693..5a8369c 100644
--- a/cloud/aws/elasticache/memcached/monitors-memcached.tf
+++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf
@@ -7,9 +7,9 @@ resource "datadog_monitor" "memcached_get_hits" {
 
   query = <<EOF
     sum(${var.get_hits_timeframe}): (
-      avg:aws.elasticache.get_hits${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count() /
-      (avg:aws.elasticache.get_hits${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count() +
-        avg:aws.elasticache.get_misses${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count())
+      avg:aws.elasticache.get_hits${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count() /
+      (avg:aws.elasticache.get_hits${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count() +
+        avg:aws.elasticache.get_misses${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count())
     ) < ${var.get_hits_threshold_critical}
   EOF
 
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index bcab961..0a52bf5 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -7,9 +7,9 @@ resource "datadog_monitor" "redis_cache_hits" {
 
   query = <<EOF
     sum(${var.cache_hits_timeframe}): (
-      avg:aws.elasticache.cache_hits${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count() /
-      (avg:aws.elasticache.cache_hits${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count() +
-        avg:aws.elasticache.cache_misses${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count())
+      avg:aws.elasticache.cache_hits${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count() /
+      (avg:aws.elasticache.cache_hits${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count() +
+        avg:aws.elasticache.cache_misses${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count())
     ) * 100 < ${var.cache_hits_threshold_critical}
   EOF
 
@@ -103,8 +103,8 @@ resource "datadog_monitor" "redis_commands" {
 
   query = <<EOF
     sum(${var.commands_timeframe}): (
-      avg:aws.elasticache.get_type_cmds${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count() +
-      avg:aws.elasticache.set_type_cmds${module.filter-tags.query_alert} by {region,cacheclusterid}.as_count()
+      avg:aws.elasticache.get_type_cmds${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count() +
+      avg:aws.elasticache.set_type_cmds${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}.as_count()
     ) <= 0
   EOF