diff --git a/defaults.tf b/defaults.tf
index 45c1ee3..a550dbe 100644
--- a/defaults.tf
+++ b/defaults.tf
@@ -22,8 +22,8 @@ locals {
 
   # Organization settings - now configurable through finops variable
   organization_defaults = {
-    finops_project_name   = var.finops.project_name
-    finops_project_number = var.finops.project_number
-    finops_project_role   = var.finops.project_role
+    finops_project_name   = coalesce(var.cluster_config.finops_project_name, var.finops.project_name)
+    finops_project_number = coalesce(var.cluster_config.finops_project_number, var.finops.project_number)
+    finops_project_role   = coalesce(var.cluster_config.finops_project_role, var.finops.project_role)
   }
 }
diff --git a/variables.tf b/variables.tf
index 27f556b..59d28ff 100644
--- a/variables.tf
+++ b/variables.tf
@@ -28,6 +28,9 @@ variable "cluster_config" {
     vpc_name             = string
     vpc_domain_name      = string
     cluster_mailing_list = optional(string)
+    finops_project_name  = optional(string)
+    finops_project_number = optional(string)
+    finops_project_role  = optional(string)
     tags                 = optional(map(string), {})
     organization         = optional(string)
   })