diff --git a/cloud/gcp/pubsub/subscription/monitors-subscription.tf b/cloud/gcp/pubsub/subscription/monitors-subscription.tf
index bc9e7b8..7862a2d 100644
--- a/cloud/gcp/pubsub/subscription/monitors-subscription.tf
+++ b/cloud/gcp/pubsub/subscription/monitors-subscription.tf
@@ -32,7 +32,7 @@ EOQ
   notify_no_data      = false
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "pubsub_category:subscription", "team:claranet", "created-by:terraform"], var.oldest_unacked_message_age_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:subscription", "team:claranet", "created-by:terraform"], var.oldest_unacked_message_age_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]
@@ -73,7 +73,7 @@ EOQ
   notify_no_data      = false
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "pubsub_category:subscription", "team:claranet", "created-by:terraform"], var.subscription_push_latency_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:subscription", "team:claranet", "created-by:terraform"], var.subscription_push_latency_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]
@@ -120,7 +120,7 @@ EOQ
   notify_no_data      = false
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "pubsub_category:subscription", "team:claranet", "created-by:terraform"], var.subscription_push_latency_anomaly_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:subscription", "team:claranet", "created-by:terraform"], var.subscription_push_latency_anomaly_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]
diff --git a/cloud/gcp/pubsub/topic/monitors-topics.tf b/cloud/gcp/pubsub/topic/monitors-topics.tf
index 927e664..d65e682 100644
--- a/cloud/gcp/pubsub/topic/monitors-topics.tf
+++ b/cloud/gcp/pubsub/topic/monitors-topics.tf
@@ -27,7 +27,7 @@ EOQ
   notify_no_data      = true
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "pubsub_category:topic", "team:claranet", "created-by:terraform"], var.sending_operations_count_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:topic", "team:claranet", "created-by:terraform"], var.sending_operations_count_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]
@@ -64,7 +64,7 @@ EOQ
   notify_no_data      = false
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "pubsub_category:topic", "team:claranet", "created-by:terraform"], var.unavailable_sending_operations_count_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:topic", "team:claranet", "created-by:terraform"], var.unavailable_sending_operations_count_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]
@@ -103,7 +103,7 @@ EOQ
   notify_no_data      = false
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "pubsub_category:topic", "team:claranet", "created-by:terraform"], var.unavailable_sending_operations_ratio_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "category:topic", "team:claranet", "created-by:terraform"], var.unavailable_sending_operations_ratio_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]