diff --git a/vpn-transit-gateway/outputs.tf b/vpn-transit-gateway/outputs.tf
index 3fb3a1b..ac67427 100644
--- a/vpn-transit-gateway/outputs.tf
+++ b/vpn-transit-gateway/outputs.tf
@@ -1,7 +1,11 @@
 output "vpn_tunnel_endpoints" {
   description = "VPN Tunnel Endpoint IP Addresses"
-  value = { for k in keys(local._vpn_settings) : k => {
-    site             = k
+  value = { for k in keys(local.vpn_settings) : k => {
+    site             = v.site
+    environment      = v.environment
+    sequence         = v.sequence
+    label            = v.label
+    full_label       = format("aws:%v:%v:%v:%v", local.region, local.account_id, aws_vpn_connection.vpn[k].id, v.label)
     customer_address = aws_customer_gateway.vpn[k].ip_address
     bgp_asn          = aws_customer_gateway.vpn[k].bgp_asn
     tunnel1_bgp_asn  = aws_vpn_connection.vpn[k].tunnel1_bgp_asn
@@ -14,9 +18,11 @@ output "vpn_tunnel_endpoints" {
 
 output "vpn_labels" {
   description = "VPN Labels for Description field of Endpoint device (Cisco ASR)"
-  value = { for k in keys(local._vpn_settings) : k => {
-    site  = k
-    label = format("aws:%v:%v:%v:%v", local.region, local.account_id, aws_vpn_connection.vpn[k].id, var.vpc_full_name)
+  value = { for k in keys(local.vpn_settings) : k => {
+    site        = v.site
+    environment = v.environment
+    sequence    = v.sequence
+    label       = format("aws:%v:%v:%v:%v", local.region, local.account_id, aws_vpn_connection.vpn[k].id, v.label)
     }
   }
 }