diff --git a/services/centralized-kubecost/2.5.0/defaults/cm.yaml b/services/centralized-kubecost/2.5.0/defaults/cm.yaml
index 487c3d87f..c5376a13a 100644
--- a/services/centralized-kubecost/2.5.0/defaults/cm.yaml
+++ b/services/centralized-kubecost/2.5.0/defaults/cm.yaml
@@ -237,7 +237,7 @@ data:
       # used for display in Kubecost UI
       clusterName: ""
       clusterProfile: production
-      cloudIntegrationSecret: # TODO: figure out how to add cloud integration secret
+      cloudIntegrationSecret: # TODO(takirala): Do we want to enable this by default?
       productKey:
         enabled: false
         #key: YOUR_KEY
diff --git a/services/kubecost/2.5.0/defaults/cm.yaml b/services/kubecost/2.5.0/defaults/cm.yaml
index 9df0d96f0..006ddf5e9 100644
--- a/services/kubecost/2.5.0/defaults/cm.yaml
+++ b/services/kubecost/2.5.0/defaults/cm.yaml
@@ -11,13 +11,13 @@ data:
         enabled: true
 
       grafana:
-        enabled: true #TODO: Disable Grafana
+        enabled: true
         proxy: false
     forecasting:
       # Enable this to use kubecost's cost forecosting model
       enabled: false
     upgrade:
-      toV2: false # TODO: Handle upgrades.
+      toV2: false # TODO(takirala): Handle upgrades.
 
     federatedETL:
       federatedCluster: true