diff --git a/config/clusters/kitware/support.values.yaml b/config/clusters/kitware/support.values.yaml
index e1a483a529..dd6e6203f8 100644
--- a/config/clusters/kitware/support.values.yaml
+++ b/config/clusters/kitware/support.values.yaml
@@ -27,6 +27,14 @@ grafana:
         hosts:
           - grafana.kitware.2i2c.cloud
 
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: kitware
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::471112920937:role/aws_ce_grafana_backend_iam_role
+
 cluster-autoscaler:
   enabled: true
   autoDiscovery:
diff --git a/terraform/aws/projects/kitware.tfvars b/terraform/aws/projects/kitware.tfvars
index 47a89e6c4f..8714f56661 100644
--- a/terraform/aws/projects/kitware.tfvars
+++ b/terraform/aws/projects/kitware.tfvars
@@ -2,12 +2,16 @@ region                 = "us-west-2"
 cluster_name           = "kitware"
 cluster_nodes_location = "us-west-2a"
 
+enable_aws_ce_grafana_backend_iam = true
+
 user_buckets = {
   "scratch-staging" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "staging" },
   },
   "scratch" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "prod" },
   },
 }