diff --git a/cloud/aws/elasticache/common/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf
index 2b6bae1..51ced20 100644
--- a/cloud/aws/elasticache/common/monitors-elasticache.tf
+++ b/cloud/aws/elasticache/common/monitors-elasticache.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "elasticache_eviction" {
 
   query = <<EOF
     ${var.eviction_time_aggregator}(${var.eviction_timeframe}): (
-      avg:aws.elasticache.evictions{${var.filter_tags}} by {region,cluster}
+      avg:aws.elasticache.evictions{${var.filter_tags}} by {region,cacheclusterid}
     ) > 0
   EOF
 
@@ -22,7 +22,7 @@ resource "datadog_monitor" "elasticache_eviction" {
 
   silenced = "${var.eviction_silenced}"
 
-  tags = ["env:${var.environment}", "resource:${var.resource}", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:${var.resource}", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "elasticache_max_connection" {
@@ -33,7 +33,7 @@ resource "datadog_monitor" "elasticache_max_connection" {
 
   query = <<EOF
     ${var.max_connection_time_aggregator}(${var.max_connection_timeframe}): (
-      avg:aws.elasticache.curr_connections{${var.filter_tags}} by {region,cluster}
+      avg:aws.elasticache.curr_connections{${var.filter_tags}} by {region,cacheclusterid}
     ) >= 65000
   EOF
 
@@ -49,7 +49,7 @@ resource "datadog_monitor" "elasticache_max_connection" {
 
   silenced = "${var.max_connection_silenced}"
 
-  tags = ["env:${var.environment}", "resource:${var.resource}", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:${var.resource}", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "elasticache_no_connection" {
@@ -60,7 +60,7 @@ resource "datadog_monitor" "elasticache_no_connection" {
 
   query = <<EOF
     ${var.no_connection_time_aggregator}(${var.no_connection_timeframe}): (
-      avg:aws.elasticache.curr_connections{${var.filter_tags}} by {region,cluster}
+      avg:aws.elasticache.curr_connections{${var.filter_tags}} by {region,cacheclusterid}
     ) <= 0
   EOF
 
@@ -76,5 +76,5 @@ resource "datadog_monitor" "elasticache_no_connection" {
 
   silenced = "${var.no_connection_silenced}"
 
-  tags = ["env:${var.environment}", "resource:${var.resource}", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:${var.resource}", "team:aws", "provider:aws"]
 }
diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index 152bd9c..9754cb1 100644
--- a/cloud/aws/elasticache/memcached/monitors-memcached.tf
+++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf
@@ -46,7 +46,7 @@ resource "datadog_monitor" "memcached_get_hits" {
 
   silenced = "${var.get_hits_silenced}"
 
-  tags = ["env:${var.environment}", "resource:memcached", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:memcached", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "memcached_cpu_high" {
@@ -78,7 +78,7 @@ resource "datadog_monitor" "memcached_cpu_high" {
 
   silenced = "${var.cpu_high_silenced}"
 
-  tags = ["env:${var.environment}", "resource:memcached", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:memcached", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "memcached_swap" {
@@ -110,7 +110,7 @@ resource "datadog_monitor" "memcached_swap" {
 
   silenced = "${var.swap_silenced}"
 
-  tags = ["env:${var.environment}", "resource:memcached", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:memcached", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "memcached_free_memory" {
@@ -143,5 +143,5 @@ resource "datadog_monitor" "memcached_free_memory" {
 
   silenced = "${var.free_memory_silenced}"
 
-  tags = ["env:${var.environment}", "resource:memcached", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:memcached", "team:aws", "provider:aws"]
 }
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index 3fae8ce..dee5909 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -46,7 +46,7 @@ resource "datadog_monitor" "redis_cache_hits" {
 
   silenced = "${var.cache_hits_silenced}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:redis", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "redis_cpu_high" {
@@ -78,7 +78,7 @@ resource "datadog_monitor" "redis_cpu_high" {
 
   silenced = "${var.cpu_high_silenced}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:redis", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "redis_swap" {
@@ -105,7 +105,7 @@ resource "datadog_monitor" "redis_swap" {
 
   silenced = "${var.swap_silenced}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:redis", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "redis_replication_lag" {
@@ -137,7 +137,7 @@ resource "datadog_monitor" "redis_replication_lag" {
 
   silenced = "${var.replication_lag_silenced}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:redis", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "redis_commands" {
@@ -165,7 +165,7 @@ resource "datadog_monitor" "redis_commands" {
 
   silenced = "${var.commands_silenced}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:redis", "team:aws", "provider:aws"]
 }
 
 resource "datadog_monitor" "redis_free_memory" {
@@ -198,5 +198,5 @@ resource "datadog_monitor" "redis_free_memory" {
 
   silenced = "${var.free_memory_silenced}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "engine:redis", "team:aws", "provider:aws"]
 }