diff --git a/backend/app/config.py b/backend/app/config.py
index 7ac2911a..3ab3d79d 100644
--- a/backend/app/config.py
+++ b/backend/app/config.py
@@ -25,9 +25,9 @@ class Settings(BaseSettings):
     SAP_PREDICTIONS_BUCKET: str
     CARBON_PREDICTIONS_BUCKET: str
     HEAT_PREDICTIONS_BUCKET: str
-    LIGHTING_COST_PREDICTIONS_BUCKET: str
-    HEATING_COST_PREDICTIONS_BUCKET: str
-    HOT_WATER_COST_PREDICTIONS_BUCKET: str
+    # LIGHTING_COST_PREDICTIONS_BUCKET: str
+    # HEATING_COST_PREDICTIONS_BUCKET: str
+    # HOT_WATER_COST_PREDICTIONS_BUCKET: str
     HEATING_KWH_PREDICTIONS_BUCKET: str
     HOTWATER_KWH_PREDICTIONS_BUCKET: str
 
@@ -49,9 +49,6 @@ def get_prediction_buckets():
         "sap_change_predictions": get_settings().SAP_PREDICTIONS_BUCKET,
         "heat_demand_predictions": get_settings().HEAT_PREDICTIONS_BUCKET,
         "carbon_change_predictions": get_settings().CARBON_PREDICTIONS_BUCKET,
-        "lighting_cost_predictions": get_settings().LIGHTING_COST_PREDICTIONS_BUCKET,
-        "heating_cost_predictions": get_settings().HEATING_COST_PREDICTIONS_BUCKET,
-        "hot_water_cost_predictions": get_settings().HOT_WATER_COST_PREDICTIONS_BUCKET,
         "heating_kwh_predictions": get_settings().HEATING_KWH_PREDICTIONS_BUCKET,
         "hotwater_kwh_predictions": get_settings().HOTWATER_KWH_PREDICTIONS_BUCKET,
     }
diff --git a/serverless.yml b/serverless.yml
index 14916629..893588c6 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -23,9 +23,9 @@ provider:
     SAP_PREDICTIONS_BUCKET: ${env:SAP_PREDICTIONS_BUCKET}
     CARBON_PREDICTIONS_BUCKET: ${env:CARBON_PREDICTIONS_BUCKET}
     HEAT_PREDICTIONS_BUCKET: ${env:HEAT_PREDICTIONS_BUCKET}
-    LIGHTING_COST_PREDICTIONS_BUCKET: ${env:LIGHTING_COST_PREDICTIONS_BUCKET}
-    HEATING_COST_PREDICTIONS_BUCKET: ${env:HEATING_COST_PREDICTIONS_BUCKET}
-    HOT_WATER_COST_PREDICTIONS_BUCKET: ${env:HOT_WATER_COST_PREDICTIONS_BUCKET}
+    #    LIGHTING_COST_PREDICTIONS_BUCKET: ${env:LIGHTING_COST_PREDICTIONS_BUCKET}
+    #    HEATING_COST_PREDICTIONS_BUCKET: ${env:HEATING_COST_PREDICTIONS_BUCKET}
+    #    HOT_WATER_COST_PREDICTIONS_BUCKET: ${env:HOT_WATER_COST_PREDICTIONS_BUCKET}
     HEATING_KWH_PREDICTIONS_BUCKET: ${env:HEATING_KWH_PREDICTIONS_BUCKET}
     HOTWATER_KWH_PREDICTIONS_BUCKET: ${env:HOTWATER_KWH_PREDICTIONS_BUCKET}
     ENERGY_ASSESSMENTS_BUCKET: ${env:ENERGY_ASSESSMENTS_BUCKET}
@@ -50,6 +50,18 @@ provider:
             - arn:aws:s3:::${env:PREDICTIONS_BUCKET}/*
             - arn:aws:s3:::${env:DATA_BUCKET}
             - arn:aws:s3:::${env:DATA_BUCKET}/*
+            - arn:aws:s3:::${env:ENERGY_ASSESSMENTS_BUCKET}
+            - arn:aws:s3:::${env:ENERGY_ASSESSMENTS_BUCKET}/*
+            - arn:aws:s3:::${env:SAP_PREDICTIONS_BUCKET}
+            - arn:aws:s3:::${env:SAP_PREDICTIONS_BUCKET}/*
+            - arn:aws:s3:::${env:CARBON_PREDICTIONS_BUCKET}
+            - arn:aws:s3:::${env:CARBON_PREDICTIONS_BUCKET}/*
+            - arn:aws:s3:::${env:HEAT_PREDICTIONS_BUCKET}
+            - arn:aws:s3:::${env:HEAT_PREDICTIONS_BUCKET}/*
+            - arn:aws:s3:::${env:HEATING_KWH_PREDICTIONS_BUCKET}
+            - arn:aws:s3:::${env:HEATING_KWH_PREDICTIONS_BUCKET}/*
+            - arn:aws:s3:::${env:HOTWATER_KWH_PREDICTIONS_BUCKET}
+            - arn:aws:s3:::${env:HOTWATER_KWH_PREDICTIONS_BUCKET}/*
 
 
 plugins: