diff --git a/common/resources.tf b/common/resources.tf
index c8babaa..0405204 100644
--- a/common/resources.tf
+++ b/common/resources.tf
@@ -1,10 +1,10 @@
 locals {
-  name        = var.bucket_name
-  bucket_name = format("%s%s", local._prefixes["s3"], var.bucket_name)
+  name        = replace(var.bucket_name, local._prefixes["s3"], "")
+  bucket_name = format("%s%s", local._prefixes["s3"], local.name)
 
   # kms_key_arn_exists = var.kms_key_arn != "" && var.kms_key_arn != null
   kms_key_arn  = aws_kms_key.key.arn
-  kms_key_name = format("%s%s", local._prefixes["kms"], var.bucket_name)
+  kms_key_name = format("%s%s", local._prefixes["kms"], local.name)
 
   condition_allowed_cidr = {
     "test" : "NotIpAddress"