diff --git a/cloud/aws/elasticache/common/modules.tf b/cloud/aws/elasticache/common/modules.tf
new file mode 100644
index 0000000..987c046
--- /dev/null
+++ b/cloud/aws/elasticache/common/modules.tf
@@ -0,0 +1,8 @@
+module "filter-tags" {
+  source = "../../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "aws_elasticache"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+}
diff --git a/cloud/aws/elasticache/common/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf
index 0e85c7c..4c28e08 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,cacheclusterid}
+      avg:aws.elasticache.evictions${module.filter-tags.query_alert} by {region,cacheclusterid}
     ) > 0
   EOF
 
@@ -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,cacheclusterid}
+      avg:aws.elasticache.curr_connections${module.filter-tags.query_alert} by {region,cacheclusterid}
     ) >= 65000
   EOF
 
@@ -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,cacheclusterid}
+      avg:aws.elasticache.curr_connections${module.filter-tags.query_alert} by {region,cacheclusterid}
     ) <= 0
   EOF
 
@@ -87,7 +87,7 @@ resource "datadog_monitor" "elasticache_swap" {
 
   query = <<EOF
     ${var.swap_time_aggregator}(${var.swap_timeframe}): (
-      avg:aws.elasticache.swap_usage{${var.filter_tags}} by {region,cacheclusterid}
+      avg:aws.elasticache.swap_usage${module.filter-tags.query_alert} by {region,cacheclusterid}
     ) > ${var.swap_threshold_critical}
   EOF
 
@@ -120,7 +120,7 @@ resource "datadog_monitor" "elasticache_free_memory" {
 
   query = <<EOF
     pct_change(avg(${var.free_memory_timeframe}),${var.free_memory_condition_timeframe}):
-      avg:aws.elasticache.freeable_memory{${var.filter_tags}} by {region,cacheclusterid,cachenodeid}
+      avg:aws.elasticache.freeable_memory${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     < ${var.free_memory_threshold_critical}
   EOF
 
@@ -152,7 +152,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{${var.filter_tags}} by {region,cacheclusterid}
+      avg:aws.elasticache.evictions${module.filter-tags.query_alert} by {region,cacheclusterid}
     > ${var.eviction_growing_threshold_critical}
   EOF
 
diff --git a/cloud/aws/elasticache/memcached/modules.tf b/cloud/aws/elasticache/memcached/modules.tf
new file mode 100644
index 0000000..987c046
--- /dev/null
+++ b/cloud/aws/elasticache/memcached/modules.tf
@@ -0,0 +1,8 @@
+module "filter-tags" {
+  source = "../../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "aws_elasticache"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+}
diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index 4ab3914..58484e1 100644
--- a/cloud/aws/elasticache/memcached/monitors-memcached.tf
+++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf
@@ -61,9 +61,9 @@ resource "datadog_monitor" "memcached_get_hits" {
 
   query = <<EOF
     sum(${var.get_hits_timeframe}): (
-      avg:aws.elasticache.get_hits{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count() /
-      (avg:aws.elasticache.get_hits{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count() +
-        avg:aws.elasticache.get_misses{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count())
+      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())
     ) < ${var.get_hits_threshold_critical}
   EOF
 
@@ -95,7 +95,7 @@ resource "datadog_monitor" "memcached_cpu_high" {
 
   query = <<EOF
     ${var.cpu_high_time_aggregator}(${var.cpu_high_timeframe}): (
-      avg:aws.elasticache.cpuutilization{${data.template_file.filter.rendered}} by {region,cacheclusterid,cachenodeid}
+      avg:aws.elasticache.cpuutilization${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) > ${var.cpu_high_threshold_critical}
   EOF
 
diff --git a/cloud/aws/elasticache/redis/modules.tf b/cloud/aws/elasticache/redis/modules.tf
new file mode 100644
index 0000000..987c046
--- /dev/null
+++ b/cloud/aws/elasticache/redis/modules.tf
@@ -0,0 +1,8 @@
+module "filter-tags" {
+  source = "../../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "aws_elasticache"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+}
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index ed61970..e37f163 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -61,9 +61,9 @@ resource "datadog_monitor" "redis_cache_hits" {
 
   query = <<EOF
     sum(${var.cache_hits_timeframe}): (
-      avg:aws.elasticache.cache_hits{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count() /
-      (avg:aws.elasticache.cache_hits{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count() +
-        avg:aws.elasticache.cache_misses{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count())
+      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())
     ) * 100 < ${var.cache_hits_threshold_critical}
   EOF
 
@@ -95,7 +95,7 @@ resource "datadog_monitor" "redis_cpu_high" {
 
   query = <<EOF
     ${var.cpu_high_time_aggregator}(${var.cpu_high_timeframe}): (
-      avg:aws.elasticache.engine_cpuutilization{${data.template_file.filter.rendered}} by {region,cacheclusterid,cachenodeid}
+      avg:aws.elasticache.engine_cpuutilization${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) > ${var.cpu_high_threshold_critical}
   EOF
 
@@ -122,7 +122,7 @@ resource "datadog_monitor" "redis_replication_lag" {
 
   query = <<EOF
     ${var.replication_lag_time_aggregator}(${var.replication_lag_timeframe}): (
-      avg:aws.elasticache.replication_lag{${data.template_file.filter.rendered}} by {region,cacheclusterid,cachenodeid}
+      avg:aws.elasticache.replication_lag${module.filter-tags.query_alert} by {region,cacheclusterid,cachenodeid}
     ) > ${var.replication_lag_threshold_critical}
   EOF
 
@@ -154,8 +154,8 @@ resource "datadog_monitor" "redis_commands" {
 
   query = <<EOF
     sum(${var.commands_timeframe}): (
-      avg:aws.elasticache.get_type_cmds{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count() +
-      avg:aws.elasticache.set_type_cmds{${data.template_file.filter.rendered}} by {region,cacheclusterid}.as_count()
+      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()
     ) <= 0
   EOF