diff --git a/config/clusters/gridsst/support.values.yaml b/config/clusters/gridsst/support.values.yaml
index 10fac3132c..e5e5fb5fb9 100644
--- a/config/clusters/gridsst/support.values.yaml
+++ b/config/clusters/gridsst/support.values.yaml
@@ -32,3 +32,11 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.gridsst.2i2c.cloud
+
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: gridsst
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::993998403439:role/aws_ce_grafana_backend_iam_role
diff --git a/terraform/aws/projects/gridsst.tfvars b/terraform/aws/projects/gridsst.tfvars
index ea6721acce..f655343706 100644
--- a/terraform/aws/projects/gridsst.tfvars
+++ b/terraform/aws/projects/gridsst.tfvars
@@ -2,12 +2,16 @@ region                 = "us-west-2"
 cluster_name           = "gridsst"
 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" },
   },
 }