diff --git a/terraform/aws/projects/template.tfvars b/terraform/aws/projects/template.tfvars
index b365c249d..055c983c1 100644
--- a/terraform/aws/projects/template.tfvars
+++ b/terraform/aws/projects/template.tfvars
@@ -13,6 +13,15 @@ enable_aws_ce_grafana_backend_iam = true
 #       to setup scratch buckets for the hubs on this cluster.
 #
 
+{% for hub in hubs %}
+filestores = {
+  "{{ hub }}" = {
+    name_suffix = "{{ hub }}",
+    tags        = { "2i2c:hub-name" : "{{ hub }}" },
+  },
+}
+{% endfor %}
+
 {% for hub in hubs %}
 # "scratch-{{ hub }}" : {
 #   "delete_after" : 7,
diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
index e7810e1dd..2f27ed993 100644
--- a/terraform/aws/variables.tf
+++ b/terraform/aws/variables.tf
@@ -208,7 +208,7 @@ variable "default_budget_alert" {
 }
 
 variable "disable_cluster_wide_filestore" {
-  default     = false
+  default     = true
   type        = bool
   description = <<-EOT
   Whether or not the initial cluster-wide `homedirs` filestore