diff --git a/fast/stage-links.sh b/fast/stage-links.sh
index 52c9e5ae6..4251a01c6 100755
--- a/fast/stage-links.sh
+++ b/fast/stage-links.sh
@@ -70,18 +70,34 @@ case $STAGE_NAME in
     exit 1
   fi
   unset GLOBALS
-  PROVIDER="providers/1-resman-tenant-providers.tf"
-  TFVARS="tfvars/0-bootstrap-tenant.auto.tfvars.json"
+  PROVIDER="tenants/$TENANT/providers/1-resman-tenant-providers.tf"
+  TFVARS="tenants/$TENANT/tfvars/0-bootstrap-tenant.auto.tfvars.json"
   ;;
 "2-networking"*)
-  PROVIDER="providers/2-networking-providers.tf"
-  TFVARS="tfvars/0-bootstrap.auto.tfvars.json
-  tfvars/1-resman.auto.tfvars.json"
+  if [[ -z "$TENANT" ]]; then
+    echo "# if this is a tenant stage, set a \$TENANT variable with the tenant shortname and run the command again"
+    PROVIDER="providers/2-networking-providers.tf"
+    TFVARS="tfvars/0-bootstrap.auto.tfvars.json
+    tfvars/1-resman.auto.tfvars.json"
+  else
+    unset GLOBALS
+    PROVIDER="tenants/$TENANT/providers/2-networking-providers.tf"
+    TFVARS="tenants/$TENANT/tfvars/0-bootstrap-tenant.auto.tfvars.json
+    tenants/$TENANT/tfvars/1-resman.auto.tfvars.json"
+  fi
   ;;
 "2-security"*)
-  PROVIDER="providers/2-security-providers.tf"
-  TFVARS="tfvars/0-bootstrap.auto.tfvars.json
-  tfvars/1-resman.auto.tfvars.json"
+  if [[ -z "$TENANT" ]]; then
+    echo "# if this is a tenant stage, set a \$TENANT variable with the tenant shortname and run the command again"
+    PROVIDER="providers/2-security-providers.tf"
+    TFVARS="tfvars/0-bootstrap.auto.tfvars.json
+    tfvars/1-resman.auto.tfvars.json"
+  else
+    unset GLOBALS
+    PROVIDER="tenants/$TENANT/providers/2-security-providers.tf"
+    TFVARS="tenants/$TENANT/tfvars/0-bootstrap-tenant.auto.tfvars.json
+    tenants/$TENANT/tfvars/1-resman.auto.tfvars.json"
+  fi
   ;;
 *)
   # check for a "dev" stage 3
diff --git a/fast/stages-multitenant/0-bootstrap-tenant/README.md b/fast/stages-multitenant/0-bootstrap-tenant/README.md
index bb7f93ee5..9cecf5f82 100644
--- a/fast/stages-multitenant/0-bootstrap-tenant/README.md
+++ b/fast/stages-multitenant/0-bootstrap-tenant/README.md
@@ -89,7 +89,7 @@ outputs_location = "~/fast-config"
 
 ### Global overrides
 
-The globals variable file linekd above contains definition which were set for the organization, for example the locations used for log sink destinations. These might not be correct for each tenant, so this stage allows overriding them via the tenant configuration variable described in the next section.
+The globals variable file linked above contains definition which were set for the organization, for example the locations used for log sink destinations. These might not be correct for each tenant, so this stage allows overriding them via the tenant configuration variable described in the next section.
 
 ### Tenant-level configuration
 
diff --git a/modules/cloud-run/main.tf b/modules/cloud-run/main.tf
index 8ef52be5d..474d05c5f 100644
--- a/modules/cloud-run/main.tf
+++ b/modules/cloud-run/main.tf
@@ -259,6 +259,7 @@ resource "google_cloud_run_service" "service" {
 
   metadata {
     annotations = local.annotations
+    labels      = var.labels
   }
 
   dynamic "traffic" {