diff --git a/blueprints/serverless/cloud-run-corporate/main.tf b/blueprints/serverless/cloud-run-corporate/main.tf
index 31d51f91..fe33cf68 100644
--- a/blueprints/serverless/cloud-run-corporate/main.tf
+++ b/blueprints/serverless/cloud-run-corporate/main.tf
@@ -188,7 +188,7 @@ module "psc_addr_main" {
   source     = "../../../modules/net-address"
   project_id = module.project_main.project_id
   psc_addresses = {
-    psc-addr-main = {
+    psc-addr = {
       address = var.ip_ranges["main"].psc_addr
       network = module.vpc_main.self_link
     }
@@ -198,9 +198,9 @@ module "psc_addr_main" {
 resource "google_compute_global_forwarding_rule" "psc_endpoint_main" {
   provider              = google-beta
   project               = module.project_main.project_id
-  name                  = "pscaddrmain"
+  name                  = "pscaddr"
   network               = module.vpc_main.self_link
-  ip_address            = module.psc_addr_main.psc_addresses["psc-addr-main"].self_link
+  ip_address            = module.psc_addr_main.psc_addresses["psc-addr"].self_link
   target                = "vpc-sc"
   load_balancing_scheme = ""
 }
@@ -286,7 +286,7 @@ module "private_dns_main" {
   client_networks = [module.vpc_main.self_link]
   domain          = local.domain_cr_main
   recordsets = {
-    "A " = { records = [module.psc_addr_main.psc_addresses["psc-addr-main"].address] }
+    "A " = { records = [module.psc_addr_main.psc_addresses["psc-addr"].address] }
   }
 }
 
@@ -299,7 +299,7 @@ module "private_dns_onprem" {
   client_networks = [module.vpc_onprem[0].self_link]
   domain          = local.domain_cr_main
   recordsets = {
-    "A " = { records = [module.psc_addr_main.psc_addresses["psc-addr-main"].address] }
+    "A " = { records = [module.psc_addr_main.psc_addresses["psc-addr"].address] }
   }
 }