diff --git a/vpc-transit-gateway-association/self/associate.tf b/vpc-transit-gateway-association/self/associate.tf
index a17fbd1..284696a 100644
--- a/vpc-transit-gateway-association/self/associate.tf
+++ b/vpc-transit-gateway-association/self/associate.tf
@@ -1,8 +1,8 @@
 locals {
   attachment_tags = {
     Name                  = format("%v:%v", data.aws_iam_account_alias.current.account_alias, var.vpc_full_name)
-    "boc:tgw:environment" = var.transit_gateway_environment
-    "boc:tgw:label"       = var.transit_gateway_label
+    "boc:tgw_environment" = var.transit_gateway_environment
+    "boc:tgw_label"       = var.transit_gateway_label
   }
 }
 
diff --git a/vpc-transit-gateway-association/self/routing.tf b/vpc-transit-gateway-association/self/routing.tf
index 24dab92..144c3c4 100644
--- a/vpc-transit-gateway-association/self/routing.tf
+++ b/vpc-transit-gateway-association/self/routing.tf
@@ -21,8 +21,8 @@ module "routing_attachment_ipv4" {
     local.base_tags,
     var.tags,
     {
-      "boc:tgw:environment" = var.transit_gateway_environment
-      "boc:tgw:label"       = var.transit_gateway_label
+      "boc:tgw_environment" = var.transit_gateway_environment
+      "boc:tgw_label"       = var.transit_gateway_label
     }
   )
 }