diff --git a/cloudtrail/main.tf b/cloudtrail/main.tf
index ff26375..dc18bf9 100644
--- a/cloudtrail/main.tf
+++ b/cloudtrail/main.tf
@@ -62,7 +62,8 @@ locals {
   #  kms_admin_roles     = compact(concat([var.kms_admin_root], var.kms_admin_roles))
   #  kms_policy_document = var.kms_policy_document != null ? var.kms_policy_document : data.aws_iam_policy_document.empty.json
 
-  bucket_name = var.name == null ? format("%v-%v-%v", lookup(local._defaults["cloudtrail"], "name"), local.account_id, local.region) : var.name
+  _bucket_name = var.name == null ? format("%v-%v-%v", lookup(local._defaults["cloudtrail"], "name"), local.account_id, local.region) : var.name
+  bucket_name  = var.enable_organization ? format("%v-%v-%v", lookup(local._defaults["org_cloudtrail"], "name"), local.account_id, local.region) : local._bucket_name
 
   role_name   = format("%v%v", local._prefixes["role"], local.name)
   policy_name = format("%v%v", local._prefixes["policy"], local.name)