diff --git a/main.tf b/main.tf
index 9910f3c..e8695e3 100644
--- a/main.tf
+++ b/main.tf
@@ -8,10 +8,9 @@ locals {
     lifecycle_expiration_days = null
   }
   default_buckets = {
-     gatus  = local.default_parameters
-     loki   = local.default_parameters
-     thanos = local.default_parameters
-     velero = local.default_parameters
+    loki   = local.default_parameters
+    thanos = local.default_parameters
+    velero = local.default_parameters
   }
   all_buckets = merge(local.default_buckets, var.bucket_specs)
 }
diff --git a/outputs.tf b/outputs.tf
index 55b893c..7101946 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,16 +1,3 @@
-output "gatus_s3_buckets" {
-  value = module.bucket["gatus"].s3_buckets
+output "buckets" {
+  value = module.bucket
 }
-
-output "loki_s3_buckets" {
-  value = module.bucket["loki"].s3_buckets
-}
-
-output "thanos_s3_buckets" {
-  value = module.bucket["thanos"].s3_buckets
-}
-
-output "velero_s3_buckets" {
-  value = module.bucket["velero"].s3_buckets
-}
-
diff --git a/variables.tf b/variables.tf
index 6ec2f8e..268d5be 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1,10 +1,10 @@
 variable "bucket_specs" {
   type = map(object({
-    bucket_name_override = optional(string, "")
-    force_destroy = optional(bool, false)
-    tags = optional(map(any), {})
-    s3_bucket_kms_key_id = optional(string, null)
-    sse_algorithm = optional(string, "aws:kms")
+    bucket_name_override      = optional(string, "")
+    force_destroy             = optional(bool, false)
+    tags                      = optional(map(any), {})
+    s3_bucket_kms_key_id      = optional(string, null)
+    sse_algorithm             = optional(string, "aws:kms")
     lifecycle_expiration_days = optional(number, null)
   }))
   default = {}
@@ -15,6 +15,6 @@ variable "cluster_name" {
 }
 
 variable "tags" {
-  type = map(any)
+  type    = map(any)
   default = {}
 }