diff --git a/database/mongodb/monitors-mongo.tf b/database/mongodb/monitors-mongo.tf
index e51394a..8f52da0 100644
--- a/database/mongodb/monitors-mongo.tf
+++ b/database/mongodb/monitors-mongo.tf
@@ -20,7 +20,7 @@ resource "datadog_monitor" "mongodb_primary" {
 
   silenced = "${var.mongodb_primary_silenced}"
 
-  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_primary_extra_tags}"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_primary_extra_tags}"]
 }
 
 resource "datadog_monitor" "mongodb_secondary" {
@@ -52,7 +52,7 @@ resource "datadog_monitor" "mongodb_secondary" {
 
   silenced = "${var.mongodb_secondary_silenced}"
 
-  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_secondary_extra_tags}"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_secondary_extra_tags}"]
 }
 
 resource "datadog_monitor" "mongodb_server_count" {
@@ -83,7 +83,7 @@ resource "datadog_monitor" "mongodb_server_count" {
 
   silenced = "${var.mongodb_secondary_silenced}"
 
-  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_secondary_extra_tags}"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_secondary_extra_tags}"]
 }
 
 resource "datadog_monitor" "mongodb_replication" {
@@ -113,5 +113,5 @@ resource "datadog_monitor" "mongodb_replication" {
 
   silenced = "${var.mongodb_replication_silenced}"
 
-  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_replication_extra_tags}"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_replication_extra_tags}"]
 }
diff --git a/database/redis/README.md b/database/redis/README.md
index 1cad5cc..dd3fb7e 100644
--- a/database/redis/README.md
+++ b/database/redis/README.md
@@ -31,6 +31,7 @@ Creates DataDog monitors with the following checks:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| blocked_clients_extra_tags | Extra tags for Redis Blocked clients monitor | string | `` | no |
 | blocked_clients_message | Custom message for Redis Blocked clients monitor | string | `` | no |
 | blocked_clients_silenced | Groups to mute for Redis Blocked clients monitor | map | `<map>` | no |
 | blocked_clients_threshold_critical | Blocked clients rate (critical threshold) | string | `30` | no |
@@ -39,12 +40,14 @@ Creates DataDog monitors with the following checks:
 | blocked_clients_timeframe | Monitor timeframe for Redis Blocked clients [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
 | environment | Architecture environment | string | - | yes |
 | evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no |
+| evictedkeys_change_extra_tags | Extra tags for Redis evicted keys monitor | string | `` | no |
 | evictedkeys_change_message | Custom message for Redis evicted keys monitor | string | `` | no |
 | evictedkeys_change_silenced | Groups to mute for Redis evicted keys monitor | map | `<map>` | no |
 | evictedkeys_change_threshold_critical | Evicted keys change (critical threshold) | string | `100` | no |
 | evictedkeys_change_threshold_warning | Evicted keys change (warning threshold) | string | `20` | no |
 | evictedkeys_change_time_aggregator | Monitor aggregator for Redis evicted keys [available values: min, max or avg] | string | `avg` | no |
 | evictedkeys_change_timeframe | Monitor timeframe for Redis evicted keys [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
+| expirations_rate_extra_tags | Extra tags for Redis keys expirations monitor | string | `` | no |
 | expirations_rate_message | Custom message for Redis keys expirations monitor | string | `` | no |
 | expirations_rate_threshold_critical | Expirations percent (critical threshold) | string | `80` | no |
 | expirations_rate_threshold_warning | Expirations percent (warning threshold) | string | `60` | no |
@@ -53,30 +56,35 @@ Creates DataDog monitors with the following checks:
 | expirations_silenced | Groups to mute for Redis keys expirations monitor | map | `<map>` | no |
 | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
 | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
+| hitrate_extra_tags | Extra tags for Redis hitrate monitor | string | `` | no |
 | hitrate_message | Custom message for Redis hitrate monitor | string | `` | no |
 | hitrate_silenced | Groups to mute for Redis hitrate monitor | map | `<map>` | no |
 | hitrate_threshold_critical | hitrate limit (critical threshold) | string | `10` | no |
 | hitrate_threshold_warning | hitrate limit (warning threshold) | string | `30` | no |
 | hitrate_time_aggregator | Monitor aggregator for Redis hitrate [available values: min, max or avg] | string | `max` | no |
 | hitrate_timeframe | Monitor timeframe for Redis hitrate [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
+| keyspace_extra_tags | Extra tags for Redis keyspace monitor | string | `` | no |
 | keyspace_message | Custom message for Redis keyspace monitor | string | `` | no |
 | keyspace_silenced | Groups to mute for Redis keyspace monitor | map | `<map>` | no |
 | keyspace_threshold_critical | Keyspace no changement (critical threshold) | string | `0` | no |
 | keyspace_threshold_warning | Keyspace no changement (warning threshold) | string | `1` | no |
 | keyspace_time_aggregator | Monitor aggregator for Redis keyspace [available values: min, max or avg] | string | `min` | no |
 | keyspace_timeframe | Monitor timeframe for Redis keyspace [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
+| latency_extra_tags | Extra tags for Redis latency monitor | string | `` | no |
 | latency_message | Custom message for Redis latency monitor | string | `` | no |
 | latency_silenced | Groups to mute for Redis latency monitor | map | `<map>` | no |
 | latency_threshold_critical | latency limit (critical threshold) | string | `100` | no |
 | latency_threshold_warning | latency limit (warning threshold) | string | `50` | no |
 | latency_time_aggregator | Monitor aggregator for Redis latency [available values: min, max or avg] | string | `min` | no |
 | latency_timeframe | Monitor timeframe for Redis latency [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
+| mem_frag_extra_tags | Extra tags for Redis memory RAM fragmentation monitor | string | `` | no |
 | mem_frag_message | Custom message for Redis memory RAM fragmentation monitor | string | `` | no |
 | mem_frag_silenced | Groups to mute for Redis memory RAM fragmentation monitor | map | `<map>` | no |
 | mem_frag_threshold_critical | memory RAM fragmentation limit (critical threshold) | string | `150` | no |
 | mem_frag_threshold_warning | memory RAM fragmentation limit (warning threshold) | string | `130` | no |
 | mem_frag_time_aggregator | Monitor aggregator for Redis memory RAM fragmentation [available values: min, max or avg] | string | `min` | no |
 | mem_frag_timeframe | Monitor timeframe for Redis memory RAM fragmentation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no |
+| mem_used_extra_tags | Extra tags for Redis RAM memory used monitor | string | `` | no |
 | mem_used_message | Custom message for Redis RAM memory used monitor | string | `` | no |
 | mem_used_silenced | Groups to mute for Redis RAM memory used monitor | map | `<map>` | no |
 | mem_used_threshold_critical | RAM memory used limit (critical threshold) | string | `95` | no |
@@ -86,6 +94,7 @@ Creates DataDog monitors with the following checks:
 | message | Message sent when a Redis monitor is triggered | string | - | yes |
 | new_host_delay | Delay in seconds for the metric evaluation | string | `300` | no |
 | not_responding_by | Group by for the service check | string | `"host","redis_host","redis_port"` | no |
+| not_responding_extra_tags | Extra tags for Redis does not respond monitor | string | `` | no |
 | not_responding_last | Parameter 'last' for the service check | string | `6` | no |
 | not_responding_message | Custom message for Redis does not respond monitor | string | `` | no |
 | not_responding_silenced | Groups to mute for Redis does not respond monitor | map | `<map>` | no |
@@ -93,6 +102,7 @@ Creates DataDog monitors with the following checks:
 | not_responding_threshold_ok | Not responding limit (ok threshold) | string | `1` | no |
 | not_responding_threshold_warning | Not responding limit (warning threshold) | string | `1` | no |
 | redis_silenced | Groups to mute for Redis monitors | map | `<map>` | no |
+| rejected_con_extra_tags | Extra tags for Redis rejected connections errors monitor | string | `` | no |
 | rejected_con_message | Custom message for Redis rejected connections errors monitor | string | `` | no |
 | rejected_con_silenced | Groups to mute for Redis rejected connections errors monitor | map | `<map>` | no |
 | rejected_con_threshold_critical | rejected connections errors limit (critical threshold) | string | `50` | no |
diff --git a/database/redis/inputs.tf b/database/redis/inputs.tf
index 2c781bc..0b6108c 100644
--- a/database/redis/inputs.tf
+++ b/database/redis/inputs.tf
@@ -48,6 +48,12 @@ variable "evictedkeys_change_message" {
   default     = ""
 }
 
+variable "evictedkeys_change_extra_tags" {
+  description = "Extra tags for Redis evicted keys monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "evictedkeys_change_time_aggregator" {
   description = "Monitor aggregator for Redis evicted keys [available values: min, max or avg]"
   type        = "string"
@@ -82,6 +88,12 @@ variable "expirations_rate_message" {
   default     = ""
 }
 
+variable "expirations_rate_extra_tags" {
+  description = "Extra tags for Redis keys expirations monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "expirations_rate_time_aggregator" {
   description = "Monitor aggregator for Redis keys expirations [available values: min, max or avg]"
   type        = "string"
@@ -116,6 +128,12 @@ variable "blocked_clients_message" {
   default     = ""
 }
 
+variable "blocked_clients_extra_tags" {
+  description = "Extra tags for Redis Blocked clients monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "blocked_clients_time_aggregator" {
   description = "Monitor aggregator for Redis Blocked clients [available values: min, max or avg]"
   type        = "string"
@@ -153,6 +171,12 @@ variable "keyspace_message" {
   default     = ""
 }
 
+variable "keyspace_extra_tags" {
+  description = "Extra tags for Redis keyspace monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "keyspace_time_aggregator" {
   description = "Monitor aggregator for Redis keyspace [available values: min, max or avg]"
   type        = "string"
@@ -187,6 +211,12 @@ variable "mem_used_message" {
   default     = ""
 }
 
+variable "mem_used_extra_tags" {
+  description = "Extra tags for Redis RAM memory used monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "mem_used_time_aggregator" {
   description = "Monitor aggregator for Redis RAM memory used [available values: min, max or avg]"
   type        = "string"
@@ -221,6 +251,12 @@ variable "mem_frag_message" {
   default     = ""
 }
 
+variable "mem_frag_extra_tags" {
+  description = "Extra tags for Redis memory RAM fragmentation monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "mem_frag_time_aggregator" {
   description = "Monitor aggregator for Redis memory RAM fragmentation [available values: min, max or avg]"
   type        = "string"
@@ -255,6 +291,12 @@ variable "rejected_con_message" {
   default     = ""
 }
 
+variable "rejected_con_extra_tags" {
+  description = "Extra tags for Redis rejected connections errors monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "rejected_con_time_aggregator" {
   description = "Monitor aggregator for Redis rejected connections errors [available values: min, max or avg]"
   type        = "string"
@@ -289,6 +331,12 @@ variable "latency_message" {
   default     = ""
 }
 
+variable "latency_extra_tags" {
+  description = "Extra tags for Redis latency monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "latency_time_aggregator" {
   description = "Monitor aggregator for Redis latency [available values: min, max or avg]"
   type        = "string"
@@ -323,6 +371,12 @@ variable "hitrate_message" {
   default     = ""
 }
 
+variable "hitrate_extra_tags" {
+  description = "Extra tags for Redis hitrate monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "hitrate_time_aggregator" {
   description = "Monitor aggregator for Redis hitrate [available values: min, max or avg]"
   type        = "string"
@@ -360,6 +414,12 @@ variable "not_responding_message" {
   default     = ""
 }
 
+variable "not_responding_extra_tags" {
+  description = "Extra tags for Redis does not respond monitor"
+  type        = "string"
+  default     = ""
+}
+
 variable "not_responding_by" {
   description = "Group by for the service check"
   type        = "string"
diff --git a/database/redis/monitors-redis.tf b/database/redis/monitors-redis.tf
index 7fd438c..d351ed8 100644
--- a/database/redis/monitors-redis.tf
+++ b/database/redis/monitors-redis.tf
@@ -31,11 +31,7 @@ EOL
   require_full_window = true
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.evictedkeys_change_extra_tags}"]
 }
 
 resource "datadog_monitor" "expirations" {
@@ -71,11 +67,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.expirations_extra_tags}"]
 }
 
 resource "datadog_monitor" "blocked_clients" {
@@ -112,11 +104,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.blocked_clients_extra_tags}"]
 }
 
 resource "datadog_monitor" "keyspace_full" {
@@ -152,11 +140,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.keyspace_extra_tags}"]
 }
 
 resource "datadog_monitor" "memory_used" {
@@ -193,11 +177,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.mem_used_extra_tags}"]
 }
 
 resource "datadog_monitor" "memory_frag" {
@@ -233,11 +213,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.mem_frag_extra_tags}"]
 }
 
 resource "datadog_monitor" "rejected_connections" {
@@ -273,11 +249,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.rejected_con_extra_tags}"]
 }
 
 resource "datadog_monitor" "latency" {
@@ -313,11 +285,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.latency_extra_tags}"]
 }
 
 resource "datadog_monitor" "hitrate" {
@@ -355,11 +323,7 @@ EOL
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.hitrate_extra_tags}"]
 }
 
 #
@@ -393,9 +357,5 @@ EOL
 
   new_host_delay = "${var.new_host_delay}"
 
-  tags = [
-    "created_by:terraform",
-    "env:${var.environment}",
-    "resource:redis",
-  ]
+  tags = ["env:${var.environment}", "type:database", "provider:redisdb", "resource:redis", "team:claranet", "created-by:terraform", "${var.not_responding_extra_tags}"]
 }