diff --git a/examples/full-setup-tf-upgrade/variables.availability_zones.tf b/examples/full-setup-tf-upgrade/variables.availability_zones.tf
new file mode 100644
index 0000000..3e906b9
--- /dev/null
+++ b/examples/full-setup-tf-upgrade/variables.availability_zones.tf
@@ -0,0 +1,5 @@
+variable "availability_zones" {
+  description = "AWS Availability zones for subnet (default: all)"
+  type        = list(string)
+  default     = []
+}
diff --git a/vpc-transit-gateway-association/common/README.md b/vpc-transit-gateway-association/common/README.md
index 0ee1a74..5c96ec6 100644
--- a/vpc-transit-gateway-association/common/README.md
+++ b/vpc-transit-gateway-association/common/README.md
@@ -21,7 +21,7 @@ No resources.
 | <a name="input_create_prefix_list_routing"></a> [create\_prefix\_list\_routing](#input\_create\_prefix\_list\_routing) | Flag to create (or not) prefix list routing. This is to be applied only on the TGW main account and VPCs | `bool` | `false` | no |
 | <a name="input_create_static_peer_routing"></a> [create\_static\_peer\_routing](#input\_create\_static\_peer\_routing) | Flag to create (or not) static peer. This can be applied on every account including the TGW main account. This conflicts with craete\_prefix\_list\_routing | `bool` | `false` | no |
 | <a name="input_data_input"></a> [data\_input](#input\_data\_input) | Map of data generated by vpc-transit-gateway-association-data | <pre>object({<br>    availablity_zone          = map(any)<br>    gateway_self              = string<br>    gateway_peer              = string<br>    route_tables_self         = map(any)<br>    route_tables_peer         = map(any)<br>    map_route_tables_self     = map(any)<br>    map_route_tables_peer     = map(any)<br>    map_vpn_route_tables_self = map(any)<br>    map_vpn_route_tables_peer = map(any)<br>    prefix_list_id_ipv4       = string<br>    vpn_prefix_list_id_ipv4   = string<br>    vpc_id                    = string<br>    vpc_cidr_block            = string<br>    vpc_cidr_blocks           = list(string)<br>  })</pre> | n/a | yes |
-| <a name="input_enable_vpn_routing"></a> [enable\_vpn\_routing](#input\_enable\_vpn\_routing) | Flag to enable VPN routing, handled through a prefix list.  This is used in the transition from per-VPC VPNs to TGW | `bool` | `false` | no |
+| <a name="input_enable_vpn_routing"></a> [enable\_vpn\_routing](#input\_enable\_vpn\_routing) | Flag to enable VPN routing, handled through a prefix list.  This is used in the transition from per-VPC VPNs to TGW | `bool` | `true` | no |
 
 ## Outputs
 
diff --git a/vpc-transit-gateway-association/common/variables.routing.tf b/vpc-transit-gateway-association/common/variables.routing.tf
index 92c41e2..e1620ff 100644
--- a/vpc-transit-gateway-association/common/variables.routing.tf
+++ b/vpc-transit-gateway-association/common/variables.routing.tf
@@ -13,5 +13,5 @@ variable "create_static_peer_routing" {
 variable "enable_vpn_routing" {
   description = "Flag to enable VPN routing, handled through a prefix list.  This is used in the transition from per-VPC VPNs to TGW"
   type        = bool
-  default     = false
+  default     = true
 }
diff --git a/vpc-transit-gateway-association/peer/README.md b/vpc-transit-gateway-association/peer/README.md
index 72d328c..27bf6e5 100644
--- a/vpc-transit-gateway-association/peer/README.md
+++ b/vpc-transit-gateway-association/peer/README.md
@@ -98,7 +98,7 @@ No modules.
 | <a name="input_create_prefix_list_routing"></a> [create\_prefix\_list\_routing](#input\_create\_prefix\_list\_routing) | Flag to create (or not) prefix list routing. This is to be applied only on the TGW main account and VPCs | `bool` | `false` | no |
 | <a name="input_create_static_peer_routing"></a> [create\_static\_peer\_routing](#input\_create\_static\_peer\_routing) | Flag to create (or not) static peer. This can be applied on every account including the TGW main account. This conflicts with craete\_prefix\_list\_routing | `bool` | `false` | no |
 | <a name="input_data_input"></a> [data\_input](#input\_data\_input) | Map of data generated by vpc-transit-gateway-association-data | <pre>object({<br>    availablity_zone          = map(any)<br>    gateway_self              = string<br>    gateway_peer              = string<br>    route_tables_self         = map(any)<br>    route_tables_peer         = map(any)<br>    map_route_tables_self     = map(any)<br>    map_route_tables_peer     = map(any)<br>    map_vpn_route_tables_self = map(any)<br>    map_vpn_route_tables_peer = map(any)<br>    prefix_list_id_ipv4       = string<br>    vpn_prefix_list_id_ipv4   = string<br>    vpc_id                    = string<br>    vpc_cidr_block            = string<br>    vpc_cidr_blocks           = list(string)<br>  })</pre> | n/a | yes |
-| <a name="input_enable_vpn_routing"></a> [enable\_vpn\_routing](#input\_enable\_vpn\_routing) | Flag to enable VPN routing, handled through a prefix list.  This is used in the transition from per-VPC VPNs to TGW | `bool` | `false` | no |
+| <a name="input_enable_vpn_routing"></a> [enable\_vpn\_routing](#input\_enable\_vpn\_routing) | Flag to enable VPN routing, handled through a prefix list.  This is used in the transition from per-VPC VPNs to TGW | `bool` | `true` | no |
 | <a name="input_network_account_profile"></a> [network\_account\_profile](#input\_network\_account\_profile) | AWS profile of the source account sharing the VPC resources | `string` | n/a | yes |
 | <a name="input_override_prefixes"></a> [override\_prefixes](#input\_override\_prefixes) | Override built-in prefixes by component. This should be used primarily for common infrastructure things | `map(string)` | `{}` | no |
 | <a name="input_private_route_table_ids"></a> [private\_route\_table\_ids](#input\_private\_route\_table\_ids) | Map of private route table IDs (which exclude the attachment subnets) | `map(string)` | `{}` | no |
diff --git a/vpc-transit-gateway-association/peer/associate.tf b/vpc-transit-gateway-association/peer/associate.tf
index 9aff5f0..ee17628 100644
--- a/vpc-transit-gateway-association/peer/associate.tf
+++ b/vpc-transit-gateway-association/peer/associate.tf
@@ -43,4 +43,3 @@ resource "aws_ec2_transit_gateway_route" "vpc_peer_all" {
   transit_gateway_route_table_id = each.value
 }
 
-