diff --git a/vpn-transit-gateway/README.md b/vpn-transit-gateway/README.md
index 19ccaee..1b59334 100644
--- a/vpn-transit-gateway/README.md
+++ b/vpn-transit-gateway/README.md
@@ -126,6 +126,5 @@ No modules.
 |------|-------------|
 | <a name="output_customer_gateway_arns"></a> [customer\_gateway\_arns](#output\_customer\_gateway\_arns) | AWS Customer Gateway ARNs |
 | <a name="output_customer_gateway_ids"></a> [customer\_gateway\_ids](#output\_customer\_gateway\_ids) | AWS Customer Gateway IDs |
-| <a name="output_debug"></a> [debug](#output\_debug) | n/a |
 | <a name="output_vpn_labels"></a> [vpn\_labels](#output\_vpn\_labels) | VPN Labels for Description field of Endpoint device (Cisco ASR) |
 | <a name="output_vpn_tunnel_endpoints"></a> [vpn\_tunnel\_endpoints](#output\_vpn\_tunnel\_endpoints) | VPN Tunnel Endpoint IP Addresses |
diff --git a/vpn-transit-gateway/vpn-config.tf b/vpn-transit-gateway/vpn-config.tf
index 83fcdae..d74c5a2 100644
--- a/vpn-transit-gateway/vpn-config.tf
+++ b/vpn-transit-gateway/vpn-config.tf
@@ -1,6 +1,6 @@
 locals {
-  single_vpn_tunnel_loopback   = tolist([for k, v in local.vpn_settings : v.tunnel_loopback])
-  single_vpn_tunnel_ip_address = tolist([for k, v in local.vpn_settings : v.ip_address])
+  single_vpn_tunnel_loopback   = coalesce([for k, v in local.vpn_settings : v.tunnel_loopback])
+  single_vpn_tunnel_ip_address = coalesce([for k, v in local.vpn_settings : v.ip_address])
   vpn_tunnel_outputs = { for k, v in local.vpn_settings : k => {
     vpn_name          = k
     site              = v.site
@@ -28,8 +28,8 @@ locals {
     tunnel1_vgw_inside_address = aws_vpn_connection.vpn[k].tunnel1_vgw_inside_address
     tunnel1_interface_number   = length(v.tunnel_interfaces) == 2 ? v.tunnel_interfaces[0] : ""
     tunnel1_track_number       = length(v.tunnel_track) == 2 ? v.tunnel_track[0] : ""
-    #    tunnel1_loopback           = v.tunnel_loopback != null ? (var.use_single_cgw ? local.single_vpn_tunnel_loopback : v.tunnel_loopback) : ""
-    tunnel1_loopback = v.tunnel_loopback != null ? v.tunnel_loopback : ""
+    tunnel1_loopback           = v.tunnel_loopback != null ? (var.use_single_cgw ? local.single_vpn_tunnel_loopback : v.tunnel_loopback) : ""
+    # tunnel1_loopback = v.tunnel_loopback != null ? v.tunnel_loopback : ""
 
     tunnel2_label              = format("%v %v %v %v %v", aws_vpn_connection.vpn[k].tunnel2_inside_cidr, local.account_id, local.region_short, var.vpc_short_name, v.label)
     tunnel2_bgp_asn            = aws_vpn_connection.vpn[k].tunnel2_bgp_asn
@@ -39,8 +39,8 @@ locals {
     tunnel2_vgw_inside_address = aws_vpn_connection.vpn[k].tunnel2_vgw_inside_address
     tunnel2_interface_number   = length(v.tunnel_interfaces) == 2 ? v.tunnel_interfaces[1] : ""
     tunnel2_track_number       = length(v.tunnel_track) == 2 ? v.tunnel_track[1] : ""
-    #    tunnel2_loopback           = v.tunnel_loopback != null ? (var.use_single_cgw ? local.single_vpn_tunnel_loopback : v.tunnel_loopback) : ""
-    tunnel2_loopback = v.tunnel_loopback != null ? v.tunnel_loopback : ""
+    tunnel2_loopback           = v.tunnel_loopback != null ? (var.use_single_cgw ? local.single_vpn_tunnel_loopback : v.tunnel_loopback) : ""
+    # tunnel2_loopback = v.tunnel_loopback != null ? v.tunnel_loopback : ""
     }
   }
   vpn_tunnel_secrets = { for k, v in local.vpn_settings : k => {
@@ -55,17 +55,17 @@ locals {
   vpn_site_common_settings = ["account_alias", "account_id", "region", "region_short", "vpc_cidr_block", "vpc_name", "vpc_short_name", "vpn_environment"]
   single_cgw_settings = {
     single_cgw       = var.use_single_cgw ? true : false
-    customer_address = var.use_single_cgw ? local.single_vpn_tunnel_ip_address : []
-    loopback         = var.use_single_cgw ? local.single_vpn_tunnel_loopback : []
+    customer_address = var.use_single_cgw ? local.single_vpn_tunnel_ip_address : ""
+    loopback         = var.use_single_cgw ? local.single_vpn_tunnel_loopback : ""
   }
 }
 
-output "debug" {
-  value = {
-    single_vpn_tunnel_loopback   = local.single_vpn_tunnel_loopback
-    single_vpn_tunnel_ip_address = local.single_vpn_tunnel_ip_address
-  }
-}
+## output "debug" {
+##   value = {
+##     single_vpn_tunnel_loopback   = local.single_vpn_tunnel_loopback
+##     single_vpn_tunnel_ip_address = local.single_vpn_tunnel_ip_address
+##   }
+## }
 
 resource "null_resource" "directory_setup" {
   triggers = {