diff --git a/3-networks-dual-svpc/modules/base_shared_vpc/main.tf b/3-networks-dual-svpc/modules/base_shared_vpc/main.tf
index 8fdbaf055..cefba1987 100644
--- a/3-networks-dual-svpc/modules/base_shared_vpc/main.tf
+++ b/3-networks-dual-svpc/modules/base_shared_vpc/main.tf
@@ -19,7 +19,7 @@ locals {
   network_name                = "vpc-${local.vpc_name}"
   private_googleapis_cidr     = module.private_service_connect.private_service_connect_ip
   google_forward_source_range = "35.199.192.0/19"
-  advertised_ip               = var.private_service_cidr == "p" ? [{ range = local.google_forward_source_range }, { range = local.private_googleapis_cidr }] : [{ range = local.private_googleapis_cidr }]
+  advertised_ip               = var.environment_code == "p" ? [{ range = local.google_forward_source_range }, { range = local.private_googleapis_cidr }] : [{ range = local.private_googleapis_cidr }]
 
 }
 
diff --git a/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf b/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf
index 53802c22a..17da512a8 100644
--- a/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf
+++ b/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf
@@ -19,7 +19,7 @@ locals {
   network_name                = "vpc-${local.vpc_name}"
   restricted_googleapis_cidr  = module.private_service_connect.private_service_connect_ip
   google_forward_source_range = "35.199.192.0/19"
-  advertised_ip               = var.private_service_cidr == "p" ? [{ range = local.google_forward_source_range }, { range = local.restricted_googleapis_cidr }] : [{ range = local.restricted_googleapis_cidr }]
+  advertised_ip               = var.environment_code == "p" ? [{ range = local.google_forward_source_range }, { range = local.restricted_googleapis_cidr }] : [{ range = local.restricted_googleapis_cidr }]
 }
 
 /******************************************
diff --git a/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf b/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf
index 49ef53872..60b87afb4 100644
--- a/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf
+++ b/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf
@@ -20,7 +20,7 @@ locals {
   network_name                = "vpc-${local.vpc_name}"
   private_googleapis_cidr     = module.private_service_connect.private_service_connect_ip
   google_forward_source_range = "35.199.192.0/19"
-  advertised_ip               = var.private_service_cidr == null ? [{ range = local.google_forward_source_range }] : [{ range = local.private_googleapis_cidr }]
+  advertised_ip               = var.environment_code == "p" ? [{ range = local.google_forward_source_range }, { range = local.private_googleapis_cidr }] : [{ range = local.private_googleapis_cidr }]
 }
 
 /******************************************
diff --git a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf
index 5742c7540..bff9f77e1 100644
--- a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf
+++ b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf
@@ -20,7 +20,7 @@ locals {
   network_name                = "vpc-${local.vpc_name}"
   restricted_googleapis_cidr  = module.private_service_connect.private_service_connect_ip
   google_forward_source_range = "35.199.192.0/19"
-  advertised_ip               = var.private_service_cidr == null ? [{ range = local.google_forward_source_range }] : [{ range = local.restricted_googleapis_cidr }]
+  advertised_ip               = var.environment_code == "p" ? [{ range = local.google_forward_source_range }, { range = local.restricted_googleapis_cidr }] : [{ range = local.restricted_googleapis_cidr}]
 }
 
 /******************************************