diff --git a/config/clusters/ubc-eoas/support.values.yaml b/config/clusters/ubc-eoas/support.values.yaml
index caec163077..6aa79434b0 100644
--- a/config/clusters/ubc-eoas/support.values.yaml
+++ b/config/clusters/ubc-eoas/support.values.yaml
@@ -32,3 +32,11 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.ubc-eoas.2i2c.cloud
+
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: ubc-eoas
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::259060176665:role/aws_ce_grafana_backend_iam_role
diff --git a/terraform/aws/projects/ubc-eoas.tfvars b/terraform/aws/projects/ubc-eoas.tfvars
index 207cd38a95..76f8b0dd1e 100644
--- a/terraform/aws/projects/ubc-eoas.tfvars
+++ b/terraform/aws/projects/ubc-eoas.tfvars
@@ -2,16 +2,19 @@ region                 = "ca-central-1"
 cluster_name           = "ubc-eoas"
 cluster_nodes_location = "ca-central-1a"
 
+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" },
   },
 }
 
-
 hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {