diff --git a/examples/full-setup-tf-upgrade/infoblox.tf.off b/examples/full-setup-tf-upgrade/infoblox.tf.off
index a2f1343..4593454 100644
--- a/examples/full-setup-tf-upgrade/infoblox.tf.off
+++ b/examples/full-setup-tf-upgrade/infoblox.tf.off
@@ -1,33 +1,33 @@
 resource "infoblox_ipv4_network_container" "vpc" {
   network_view = "default"
   cidr         = var.vpc_cidr_block
-  comment      = format("%v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name)
+  comment      = format("%v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name)
 }
 
 resource "infoblox_ipv4_network_container" "vpc_public" {
-  for_each     = { for sn in var.public_subnets : sn.label => sn if sn.offset==0}
+  for_each     = { for sn in var.public_subnets : sn.label => sn if sn.offset == 0 && sn.enabled && sn.base_cidr != var.vpc_cidr_block }
   network_view = "default"
   cidr         = each.value.base_cidr
-  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label)
+  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name, each.value.label)
 }
 
 resource "infoblox_ipv4_network_container" "vpc_private" {
-  for_each     = { for sn in var.private_subnets : sn.label => sn if sn.offset==0}
+  for_each     = { for sn in var.private_subnets : sn.label => sn if sn.offset == 0 && sn.enabled && sn.base_cidr != var.vpc_cidr_block }
   network_view = "default"
   cidr         = each.value.base_cidr
-  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label)
+  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name, each.value.label)
 }
 
 resource "infoblox_ipv4_network" "vpc_public_subnets" {
   for_each     = { for sn in module.subnets.public_subnets_ids : sn.subnet => sn }
   network_view = "default"
   cidr         = each.value.subnet
-  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label)
+  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name, each.value.label)
 }
 
 resource "infoblox_ipv4_network" "vpc_private_subnets" {
   for_each     = { for sn in module.subnets.private_subnets_ids : sn.subnet => sn }
   network_view = "default"
   cidr         = each.value.subnet
-  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label)
+  comment      = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name, each.value.label)
 }