diff --git a/.spacelift/config.yml b/.spacelift/config.yml
index bc464466c..5b8f6a0e8 100644
--- a/.spacelift/config.yml
+++ b/.spacelift/config.yml
@@ -1,2 +1,2 @@
 version: 1
-module_version: 0.1.0
+module_version: 0.2.0
diff --git a/outputs.tf b/outputs.tf
index 301a64f30..3a3e735eb 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -662,6 +662,26 @@ output "database_subnets_az_ids" {
   value       = aws_subnet.database[*].availability_zone_id
 }
 
+output "intra_subnets_az_names" {
+  description = "List of AZ names of intra subnets"
+  value       = aws_subnet.intra[*].availability_zone
+}
+
+output "intra_subnets_az_ids" {
+  description = "List of AZ IDs of intra subnets"
+  value       = aws_subnet.intra[*].availability_zone_id
+}
+
+output "tgw_subnets_az_names" {
+  description = "List of AZ names of tgw subnets"
+  value       = aws_subnet.tgw[*].availability_zone
+}
+
+output "tgw_subnets_az_ids" {
+  description = "List of AZ IDs of tgw subnets"
+  value       = aws_subnet.tgw[*].availability_zone_id
+}
+
 ################################################################################
 # TGW Subnets
 ################################################################################
diff --git a/tgw.tf b/tgw.tf
index e8b6a76a4..58424d9a2 100644
--- a/tgw.tf
+++ b/tgw.tf
@@ -183,7 +183,7 @@ locals {
   create_public_to_tgw = (local.create_public_subnets && contains(local.subnets_tgw_routed, "public"))
   public_to_tgw_cidr_pairs = local.create_public_to_tgw ? flatten([
     for public_rtb in aws_route_table.public : [
-      for cidr in var.transit_gateway_routes["public"]: {
+      for cidr in var.transit_gateway_routes["public"] : {
         rtb_id = public_rtb.id
         cidr   = cidr
       }
@@ -192,7 +192,7 @@ locals {
 }
 
 resource "aws_route" "public_to_tgw" {
-  for_each = local.create_public_to_tgw ? {for i, v in local.public_to_tgw_cidr_pairs : "${i}-${v.cidr}" => v} : {}
+  for_each = local.create_public_to_tgw ? { for i, v in local.public_to_tgw_cidr_pairs : "${i}-${v.cidr}" => v } : {}
 
   destination_cidr_block     = can(regex("^pl-", each.value.cidr)) ? null : each.value.cidr
   destination_prefix_list_id = can(regex("^pl-", each.value.cidr)) ? each.value.cidr : null
@@ -208,7 +208,7 @@ locals {
   create_private_to_tgw = (local.create_private_subnets && contains(local.subnets_tgw_routed, "private"))
   private_to_tgw_cidr_pairs = local.create_private_to_tgw ? flatten([
     for private_rtb in aws_route_table.private : [
-      for cidr in var.transit_gateway_routes["private"]: {
+      for cidr in var.transit_gateway_routes["private"] : {
         rtb_id = private_rtb.id
         cidr   = cidr
       }
@@ -217,7 +217,7 @@ locals {
 }
 
 resource "aws_route" "private_to_tgw" {
-  for_each = local.create_private_to_tgw ? {for i, v in local.private_to_tgw_cidr_pairs : "${i}-${v.cidr}" => v} : {}
+  for_each = local.create_private_to_tgw ? { for i, v in local.private_to_tgw_cidr_pairs : "${i}-${v.cidr}" => v } : {}
 
   destination_cidr_block     = can(regex("^pl-", each.value.cidr)) ? null : each.value.cidr
   destination_prefix_list_id = can(regex("^pl-", each.value.cidr)) ? each.value.cidr : null
diff --git a/variables.tf b/variables.tf
index bfd56e37d..811811571 100644
--- a/variables.tf
+++ b/variables.tf
@@ -21,8 +21,8 @@ variable "name_prefix" {
 }
 
 variable "short_aws_region" {
-  type = string
   description = "The AWS region code where the VPC will be created"
+  type        = string
 }
 
 variable "vpc_name_suffix" {