diff --git a/vpn-transit-gateway/vpn-config.tf b/vpn-transit-gateway/vpn-config.tf
index 80054f2..8d83409 100644
--- a/vpn-transit-gateway/vpn-config.tf
+++ b/vpn-transit-gateway/vpn-config.tf
@@ -59,6 +59,7 @@ locals {
     single_cgw       = var.use_single_cgw ? true : false
     customer_address = var.use_single_cgw ? local.single_vpn_tunnel_ip_address[s][0] : ""
     loopback         = var.use_single_cgw ? local.single_vpn_tunnel_loopback[s][0] : ""
+    vpn_environment  = var.tgw_environment
   } }
 }
 
@@ -119,7 +120,7 @@ resource "local_sensitive_file" "vpn_site_details_json" {
   #  content         = yamlencode({ version = local._module_version, site = each.key, vpns = each.value })
   content = jsonencode(merge({ version = local._module_version, site = each.key, vpns = each.value }, local.single_cgw_settings[each.key], { for k in local.vpn_site_common_settings : k => each.value[0][k] }))
   #  filename        = format("%v/%v/site.%v.%v.%v.json", path.root, null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key)
-  filename        = format("%v/%v/site.%v.%v.%v.%v.json", path.root, null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key, each.value.vpn_environment)
+  filename        = format("%v/%v/site.%v.%v.%v.%v.json", path.root, null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key, local.single_cgw_settings[each.key].vpn_environment)
   file_permission = "0644"
 }
 
@@ -127,7 +128,7 @@ resource "local_sensitive_file" "vpn_site_details_yaml" {
   for_each = var.generate_yaml_files ? local.vpn_site_tunnel_outputs : {}
   content  = yamlencode(merge({ version = local._module_version, site = each.key, vpns = each.value }, local.single_cgw_settings[each.key], { for k in local.vpn_site_common_settings : k => each.value[0][k] }))
   #  filename        = format("%v/%v/site.%v.%v.%v.yml", path.root, null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key)
-  filename        = format("%v/%v/site.%v.%v.%v.%v.yml", path.root, null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key, each.value.vpn_environment)
+  filename        = format("%v/%v/site.%v.%v.%v.%v.yml", path.root, null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key, local.single_cgw_settings[each.key].vpn_environment)
   file_permission = "0644"
 }