diff --git a/examples/full-setup-tf-upgrade/tgw/variables.vpc-transit-gateway.tf b/examples/full-setup-tf-upgrade/tgw/variables.vpc-transit-gateway.tf
index f705de2..0d3f659 100644
--- a/examples/full-setup-tf-upgrade/tgw/variables.vpc-transit-gateway.tf
+++ b/examples/full-setup-tf-upgrade/tgw/variables.vpc-transit-gateway.tf
@@ -1,13 +1,13 @@
-variable "tgw_environment" {
-  description = "Transit Gateway environment route table (services, dev, test, stage, prod, cre)"
-  type        = string
-  default     = null
-
-  validation {
-    condition     = contains(["services", "dev", "test", "stage", "prod", "cre"], var.tgw_environment)
-    error_message = "The tgw_environment must contain one of the legal values: services, dev, test, stage, prod, cre"
-  }
-}
+## variable "tgw_environment" {
+##   description = "Transit Gateway environment route table (services, dev, test, stage, prod, cre)"
+##   type        = string
+##   default     = null
+## 
+##   validation {
+##     condition     = contains(["services", "dev", "test", "stage", "prod", "cre"], var.tgw_environment)
+##     error_message = "The tgw_environment must contain one of the legal values: services, dev, test, stage, prod, cre"
+##   }
+## }
 
 variable "tgw_environment_exists" {
   description = "Transit Gateway environment already setup in another VPC (say, for multiple test enviroments but diff vpc like test,ite,qa)"
@@ -52,11 +52,11 @@ variable "tgw_vpn_routing_prefix_list" {
   default     = ""
 }
 
-variable "tgw_enable_vpn_routing" {
-  description = "Enable VPN routing over Transit Gateway"
-  type        = bool
-  default     = false
-}
+## variable "tgw_enable_vpn_routing" {
+##   description = "Enable VPN routing over Transit Gateway"
+##   type        = bool
+##   default     = false
+## }
 
 variable "tgw_enable_vpn" {
   description = "Enable AWS VPN Configuration on the Transit Gateway (default: false)"
diff --git a/examples/full-setup-tf-upgrade/variables.vpc.tf b/examples/full-setup-tf-upgrade/variables.vpc.tf
index a4cbcf8..8c8b6e1 100644
--- a/examples/full-setup-tf-upgrade/variables.vpc.tf
+++ b/examples/full-setup-tf-upgrade/variables.vpc.tf
@@ -104,6 +104,11 @@ variable "tgw_environment" {
   description = "Transit Gateway environment route table (services, dev, test, stage, prod, cre)"
   type        = string
   default     = null
+
+  validation {
+    condition     = var.tgw_environment == null || contains(["services", "dev", "test", "stage", "prod", "cre"], var.tgw_environment)
+    error_message = "The tgw_environment must contain one of the legal values: services, dev, test, stage, prod, cre"
+  }
 }
 
 variable "tgw_enable_vpn_routing" {