diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf
index 32d7769..dc3f77a 100644
--- a/cloud/aws/alb/monitors-alb.tf
+++ b/cloud/aws/alb/monitors-alb.tf
@@ -24,7 +24,7 @@ resource "datadog_monitor" "ALB_no_healthy_instances" {
 
   silenced = "${var.alb_no_healthy_instances_silenced}"
 
-  tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ALB_latency" {
@@ -54,7 +54,7 @@ resource "datadog_monitor" "ALB_latency" {
 
   silenced = "${var.latency_silenced}"
 
-  tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ALB_httpcode_5xx" {
@@ -87,7 +87,7 @@ resource "datadog_monitor" "ALB_httpcode_5xx" {
 
   silenced = "${var.httpcode_alb_5xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ALB_httpcode_4xx" {
@@ -120,7 +120,7 @@ resource "datadog_monitor" "ALB_httpcode_4xx" {
 
   silenced = "${var.httpcode_alb_4xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ALB_httpcode_target_5xx" {
@@ -153,7 +153,7 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" {
 
   silenced = "${var.httpcode_target_5xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ALB_httpcode_target_4xx" {
@@ -186,5 +186,5 @@ resource "datadog_monitor" "ALB_httpcode_target_4xx" {
 
   silenced = "${var.httpcode_target_4xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:alb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf
index f937691..4c740ec 100644
--- a/cloud/aws/apigateway/monitors-api.tf
+++ b/cloud/aws/apigateway/monitors-api.tf
@@ -26,7 +26,7 @@ resource "datadog_monitor" "API_Gateway_latency" {
 
   silenced = "${var.latency_silenced}"
 
-  tags = ["env:${var.environment}", "resource:apigateway", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform"]
 }
 
 # Monitoring API Gateway 5xx errors percent
@@ -60,7 +60,7 @@ resource "datadog_monitor" "API_http_5xx_errors_count" {
 
   silenced = "${var.http_5xx_requests_silenced}"
 
-  tags = ["env:${var.environment}", "resource:apigateway", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform"]
 }
 
 # Monitoring API Gateway 4xx errors percent
@@ -94,5 +94,5 @@ resource "datadog_monitor" "API_http_4xx_errors_count" {
 
   silenced = "${var.http_4xx_requests_silenced}"
 
-  tags = ["env:${var.environment}", "resource:apigateway", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
index 614886b..d923285 100644
--- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf
+++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
@@ -33,7 +33,7 @@ EOF
 
   silenced = "${var.es_cluster_status_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elasticsearch", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform"]
 }
 
 ### Elasticsearch cluster free storage space monitor ###
@@ -67,7 +67,7 @@ EOF
 
   silenced = "${var.diskspace_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elasticsearch", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform"]
 }
 
 ### Elasticsearch cluster CPU monitor ###
@@ -100,5 +100,5 @@ EOF
 
   silenced = "${var.cpu_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elasticsearch", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf
index 9ba0e35..d2400c8 100644
--- a/cloud/aws/elb/monitors-elb.tf
+++ b/cloud/aws/elb/monitors-elb.tf
@@ -22,7 +22,7 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
 
   silenced = "${var.elb_no_healthy_instance_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ELB_too_much_4xx" {
@@ -57,7 +57,7 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
 
   silenced = "${var.elb_4xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ELB_too_much_5xx" {
@@ -92,7 +92,7 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
 
   silenced = "${var.elb_5xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ELB_too_much_4xx_backend" {
@@ -127,7 +127,7 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
 
   silenced = "${var.elb_backend_4xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ELB_too_much_5xx_backend" {
@@ -162,7 +162,7 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
 
   silenced = "${var.elb_backend_5xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "ELB_backend_latency" {
@@ -194,5 +194,5 @@ resource "datadog_monitor" "ELB_backend_latency" {
 
   silenced = "${var.elb_backend_latency_silenced}"
 
-  tags = ["env:${var.environment}", "resource:elb", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
index 142fd61..3592fe1 100644
--- a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
+++ b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
@@ -27,5 +27,5 @@ resource "datadog_monitor" "firehose_incoming_records" {
 
   silenced = "${var.incoming_records_silenced}"
 
-  tags = ["env:${var.environment}", "resource:kinesis-firehose", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:kinesis-firehose", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/aws/rds/monitors-rds.tf b/cloud/aws/rds/monitors-rds.tf
index f563cf0..1d2caea 100644
--- a/cloud/aws/rds/monitors-rds.tf
+++ b/cloud/aws/rds/monitors-rds.tf
@@ -27,7 +27,7 @@ EOF
 
   silenced = "${var.cpu_silenced}"
 
-  tags = ["env:${var.environment}", "resource:rds", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"]
 }
 
 ### RDS instance free space monitor ###
@@ -60,5 +60,5 @@ EOF
 
   silenced = "${var.diskspace_silenced}"
 
-  tags = ["env:${var.environment}", "resource:rds", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/aws/vpn/monitors-vpn.tf b/cloud/aws/vpn/monitors-vpn.tf
index 37d5755..ba7d110 100644
--- a/cloud/aws/vpn/monitors-vpn.tf
+++ b/cloud/aws/vpn/monitors-vpn.tf
@@ -21,5 +21,5 @@ resource "datadog_monitor" "VPN_status" {
 
   silenced = "${var.vpn_status_silenced}"
 
-  tags = ["env: ${var.environment}", "resource:vpn", "team:aws", "provider:aws"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:vpn", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index aad2941..0487e66 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -24,7 +24,7 @@ resource "datadog_monitor" "apimgt_status" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "apimgt_failed_requests" {
@@ -56,7 +56,7 @@ resource "datadog_monitor" "apimgt_failed_requests" {
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "apimgt_other_requests" {
@@ -88,7 +88,7 @@ resource "datadog_monitor" "apimgt_other_requests" {
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "apimgt_unauthorized_requests" {
@@ -120,7 +120,7 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" {
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "apimgt_successful_requests" {
@@ -152,5 +152,5 @@ resource "datadog_monitor" "apimgt_successful_requests" {
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:apimanagement", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:apimanagement", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index 83cfded..6f3a92e 100644
--- a/cloud/azure/app-services/monitors-app_services.tf
+++ b/cloud/azure/app-services/monitors-app_services.tf
@@ -26,7 +26,7 @@ resource "datadog_monitor" "appservices_response_time" {
   timeout_h           = 0
   include_tags        = true
 
-  tags = ["env:${var.environment}", "resource:appservices", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"]
 }
 
 # Monitoring App Services memory usage
@@ -57,7 +57,7 @@ resource "datadog_monitor" "appservices_memory_usage_count" {
   timeout_h           = 0
   include_tags        = true
 
-  tags = ["env:${var.environment}", "resource:appservices", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"]
 }
 
 # Monitoring App Services 5xx errors percent
@@ -89,7 +89,7 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" {
   timeout_h           = 1
   include_tags        = true
 
-  tags = ["env:${var.environment}", "resource:appservices", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"]
 }
 
 # Monitoring App Services 4xx errors percent
@@ -121,7 +121,7 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" {
   timeout_h           = 1
   include_tags        = true
 
-  tags = ["env:${var.environment}", "resource:appservices", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"]
 }
 
 # Monitoring App Services HTTP 2xx & 3xx status pages percent
@@ -154,5 +154,5 @@ resource "datadog_monitor" "appservices_http_success_status_rate" {
   timeout_h           = 1
   include_tags        = true
 
-  tags = ["env:${var.environment}", "resource:appservices", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:app-services", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf
index e357eac..b31fdf0 100644
--- a/cloud/azure/eventhub/monitors-eventhub.tf
+++ b/cloud/azure/eventhub/monitors-eventhub.tf
@@ -22,7 +22,7 @@ resource "datadog_monitor" "eventhub_status" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:eventhub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventhub", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "eventhub_failed_requests" {
@@ -57,7 +57,7 @@ resource "datadog_monitor" "eventhub_failed_requests" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:eventhub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventhub", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "eventhub_errors" {
@@ -97,5 +97,5 @@ resource "datadog_monitor" "eventhub_errors" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:eventhub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:eventhub", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/iothubs/monitors-iothubs.tf b/cloud/azure/iothubs/monitors-iothubs.tf
index 514bcf2..b80cc43 100644
--- a/cloud/azure/iothubs/monitors-iothubs.tf
+++ b/cloud/azure/iothubs/monitors-iothubs.tf
@@ -29,7 +29,7 @@ resource "datadog_monitor" "too_many_jobs_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_list_jobs_failed" {
@@ -63,7 +63,7 @@ resource "datadog_monitor" "too_many_list_jobs_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_query_jobs_failed" {
@@ -97,7 +97,7 @@ resource "datadog_monitor" "too_many_query_jobs_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "status" {
@@ -124,7 +124,7 @@ resource "datadog_monitor" "status" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "total_devices" {
@@ -151,7 +151,7 @@ resource "datadog_monitor" "total_devices" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_c2d_methods_failed" {
@@ -185,7 +185,7 @@ resource "datadog_monitor" "too_many_c2d_methods_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_c2d_twin_read_failed" {
@@ -219,7 +219,7 @@ resource "datadog_monitor" "too_many_c2d_twin_read_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_c2d_twin_update_failed" {
@@ -253,7 +253,7 @@ resource "datadog_monitor" "too_many_c2d_twin_update_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_d2c_twin_read_failed" {
@@ -287,7 +287,7 @@ resource "datadog_monitor" "too_many_d2c_twin_read_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_d2c_twin_update_failed" {
@@ -321,7 +321,7 @@ resource "datadog_monitor" "too_many_d2c_twin_update_failed" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" {
@@ -358,7 +358,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" {
@@ -395,7 +395,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" {
@@ -432,7 +432,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" {
@@ -460,5 +460,5 @@ resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:iothub", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:iothubs", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf
index a155c19..8a076f7 100644
--- a/cloud/azure/redis/monitors-azure-redis.tf
+++ b/cloud/azure/redis/monitors-azure-redis.tf
@@ -22,7 +22,7 @@ resource "datadog_monitor" "status" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "evictedkeys" {
@@ -54,7 +54,7 @@ EOF
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "percent_processor_time" {
@@ -86,7 +86,7 @@ EOF
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "server_load" {
@@ -118,5 +118,5 @@ EOF
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:redis", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:redis", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf
index 03415cd..276bd51 100644
--- a/cloud/azure/servicebus/monitors-service-bus.tf
+++ b/cloud/azure/servicebus/monitors-service-bus.tf
@@ -22,5 +22,5 @@ EOF
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:servicebus", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:servicebus", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/sql-database/monitors-sql-database-basics.tf b/cloud/azure/sql-database/monitors-sql-database-basics.tf
index ff289eb..342ddb8 100644
--- a/cloud/azure/sql-database/monitors-sql-database-basics.tf
+++ b/cloud/azure/sql-database/monitors-sql-database-basics.tf
@@ -26,7 +26,7 @@ resource "datadog_monitor" "sql-database_cpu_90_15min" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "sql-database_free_space_low" {
@@ -58,7 +58,7 @@ resource "datadog_monitor" "sql-database_free_space_low" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "sql-database_dtu_consumption_high" {
@@ -90,7 +90,7 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "sql-database_deadlocks_count" {
@@ -121,5 +121,5 @@ resource "datadog_monitor" "sql-database_deadlocks_count" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:sqldatabase", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:sql-database", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index e9deb58..f235296 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -26,7 +26,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "successful_requests" {
@@ -57,7 +57,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "latency" {
@@ -88,7 +88,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "timeout_error_requests" {
@@ -119,7 +119,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "network_error_requests" {
@@ -150,7 +150,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "throttling_error_requests" {
@@ -181,7 +181,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "server_other_error_requests" {
@@ -212,7 +212,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "client_other_error_requests" {
@@ -243,7 +243,7 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "authorization_error_requests" {
@@ -274,5 +274,5 @@ EOF
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "resource:storage", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"]
 }
diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
index f2c2170..b007bc5 100644
--- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf
+++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
@@ -22,7 +22,7 @@ resource "datadog_monitor" "status" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  tags = ["env:${var.environment}", "resource:streamanalytics", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "su_utilization" {
@@ -54,7 +54,7 @@ resource "datadog_monitor" "su_utilization" {
 
   silenced = "${var.su_utilization_silenced}"
 
-  tags = ["env:${var.environment}", "resource:streamanalytics", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "failed_function_requests" {
@@ -87,7 +87,7 @@ resource "datadog_monitor" "failed_function_requests" {
 
   silenced = "${var.failed_function_requests_silenced}"
 
-  tags = ["env:${var.environment}", "resource:streamanalytics", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "conversion_errors" {
@@ -119,7 +119,7 @@ resource "datadog_monitor" "conversion_errors" {
 
   silenced = "${var.conversion_errors_silenced}"
 
-  tags = ["env:${var.environment}", "resource:streamanalytics", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "runtime_errors" {
@@ -151,5 +151,5 @@ resource "datadog_monitor" "runtime_errors" {
 
   silenced = "${var.runtime_errors_silenced}"
 
-  tags = ["env:${var.environment}", "resource:streamanalytics", "team:azure", "provider:azure"]
+  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform"]
 }
diff --git a/databases/mongodb/README.md b/database/mongodb/README.md
similarity index 100%
rename from databases/mongodb/README.md
rename to database/mongodb/README.md
diff --git a/databases/mongodb/inputs.tf b/database/mongodb/inputs.tf
similarity index 100%
rename from databases/mongodb/inputs.tf
rename to database/mongodb/inputs.tf
diff --git a/databases/mongodb/modules.tf b/database/mongodb/modules.tf
similarity index 100%
rename from databases/mongodb/modules.tf
rename to database/mongodb/modules.tf
diff --git a/databases/mongodb/monitors-mongo.tf b/database/mongodb/monitors-mongo.tf
similarity index 85%
rename from databases/mongodb/monitors-mongo.tf
rename to database/mongodb/monitors-mongo.tf
index 7dcef7e..4f307b1 100644
--- a/databases/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}", "resource:mongodb"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "mongodb_secondary" {
@@ -52,7 +52,7 @@ resource "datadog_monitor" "mongodb_secondary" {
 
   silenced = "${var.mongodb_secondary_silenced}"
 
-  tags = ["env:${var.environment}", "resource:mongodb"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform"]
 }
 
 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}", "resource:mongodb"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "mongodb_replication" {
@@ -113,5 +113,5 @@ resource "datadog_monitor" "mongodb_replication" {
 
   silenced = "${var.mongodb_replication_silenced}"
 
-  tags = ["env:${var.environment}", "resource:mongodb"]
+  tags = ["env:${var.environment}", "type:database", "provider:mongodb", "resource:mongodb", "team:claranet", "created-by:terraform"]
 }
diff --git a/databases/mongodb/outputs.tf b/database/mongodb/outputs.tf
similarity index 100%
rename from databases/mongodb/outputs.tf
rename to database/mongodb/outputs.tf
diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index 58d73cf..2f23c14 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -24,5 +24,5 @@ resource "datadog_monitor" "datadog_apache_process" {
 
   silenced = "${var.apache_connect_silenced}"
 
-  tags = ["env:${var.environment}", "resource:apache"]
+  tags = ["env:${var.environment}", "type:middleware", "provider:apache", "resource:apache", "team:claranet", "created-by:terraform"]
 }
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index 7b5605f..6c200f0 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -24,5 +24,5 @@ resource "datadog_monitor" "datadog_nginx_process" {
 
   silenced = "${var.nginx_connect_silenced}"
 
-  tags = ["env:${var.environment}", "resource:nginx"]
+  tags = ["env:${var.environment}", "type:middleware", "provider:nginx", "resource:nginx", "team:claranet", "created-by:terraform"]
 }
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index 70aa7a0..9ee5468 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -28,7 +28,7 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
 
   silenced = "${var.php_fpm_busy_silenced}"
 
-  tags = ["env:${var.environment}", "resource:php-fpm"]
+  tags = ["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform"]
 }
 
 resource "datadog_monitor" "datadog_fpm_process" {
@@ -58,5 +58,5 @@ resource "datadog_monitor" "datadog_fpm_process" {
 
   silenced = "${var.php_fpm_connect_silenced}"
 
-  tags = ["env:${var.environment}", "resource:php-fpm"]
+  tags = ["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform"]
 }
diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index 887ca85..c648058 100644
--- a/system/generic/monitors-system.tf
+++ b/system/generic/monitors-system.tf
@@ -15,7 +15,7 @@ resource "datadog_monitor" "datadog_cpu_too_high" {
     critical = "${var.cpu_high_threshold_critical}"
   }
 
-  tags = ["env:${var.environment}", "type:system", "resource:cpu"]
+  tags = ["env:${var.environment}", "type:system", "provider:system-check", "resource:generic", "team:claranet", "created-by:terraform"]
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -47,7 +47,7 @@ resource "datadog_monitor" "datadog_load_too_high" {
     critical = "${var.cpu_load_threshold_critical}"
   }
 
-  tags = ["env:${var.environment}", "type:system", "resource:load"]
+  tags = ["env:${var.environment}", "type:system", "provider:system-core", "resource:generic", "team:claranet", "created-by:terraform"]
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -79,7 +79,7 @@ resource "datadog_monitor" "datadog_free_disk_space_too_low" {
     critical = "${var.free_disk_space_threshold_critical}"
   }
 
-  tags = ["env:${var.environment}", "type:system", "resource:disk"]
+  tags = ["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"]
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -111,7 +111,7 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" {
     critical = "${var.free_disk_inodes_threshold_critical}"
   }
 
-  tags = ["env:${var.environment}", "type:system", "resource:disk"]
+  tags = ["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"]
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -143,7 +143,7 @@ resource "datadog_monitor" "datadog_free_memory" {
     critical = "${var.free_memory_threshold_critical}"
   }
 
-  tags = ["env:${var.environment}", "type:system", "resource:memory"]
+  tags = ["env:${var.environment}", "type:system", "provider:system-check", "resource:generic", "team:claranet", "created-by:terraform"]
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"