diff --git a/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf b/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
index 8a003cf..f4c5c60 100644
--- a/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
+++ b/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
@@ -32,14 +32,7 @@ EOF
 
   silenced = "${var.cpu_utilization_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "resource:cloud-sql",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "${var.cpu_utilization_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.cpu_utilization_extra_tags}"]
 }
 
 #
@@ -76,14 +69,7 @@ EOF
 
   silenced = "${var.disk_utilization_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "${var.disk_utilization_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.disk_utilization_extra_tags}"]
 }
 
 #
@@ -126,14 +112,7 @@ EOF
 
   silenced = "${var.disk_utilization_forecast_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "${var.disk_utilization_forecast_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.disk_utilization_forecast_extra_tags}"]
 }
 
 #
@@ -170,14 +149,7 @@ EOF
 
   silenced = "${var.memory_utilization_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "${var.memory_utilization_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.memory_utilization_extra_tags}"]
 }
 
 #
@@ -220,14 +192,7 @@ EOF
 
   silenced = "${var.memory_utilization_forecast_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "${var.memory_utilization_forecast_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.memory_utilization_forecast_extra_tags}"]
 }
 
 #
@@ -263,12 +228,5 @@ EOF
 
   silenced = "${var.failover_unavailable_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "${var.failover_unavailable_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.failover_unavailable_extra_tags}"]
 }
diff --git a/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf b/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf
index d4777cb..02d7725 100644
--- a/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf
+++ b/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf
@@ -32,15 +32,7 @@ EOF
 
   silenced = "${var.replication_lag_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "engine:mysql",
-    "${var.replication_lag_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "engine:mysql", "${var.replication_lag_extra_tags}"]
 }
 
 #
@@ -86,15 +78,7 @@ EOF
 
   silenced = "${var.queries_changing_anomaly_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "engine:mysql",
-    "${var.queries_changing_anomaly_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "engine:mysql", "${var.queries_changing_anomaly_extra_tags}"]
 }
 
 #
@@ -140,13 +124,5 @@ EOF
 
   silenced = "${var.questions_changing_anomaly_silenced}"
 
-  tags = [
-    "team:gcp",
-    "provider:gcp",
-    "env:${var.environment}",
-    "created_by:terraform",
-    "resource:cloud-sql",
-    "engine:mysql",
-    "${var.questions_changing_anomaly_extra_tags}",
-  ]
+  tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "engine:mysql", "${var.questions_changing_anomaly_extra_tags}"]
 }