diff --git a/infrastructure/terraform/lambda/engine/main.tf b/infrastructure/terraform/lambda/engine/main.tf
index f9cb4f46..6d0603e6 100644
--- a/infrastructure/terraform/lambda/engine/main.tf
+++ b/infrastructure/terraform/lambda/engine/main.tf
@@ -37,25 +37,25 @@ module "lambda" {
       DB_PASSWORD = local.db_credentials.db_assessment_model_password
 
       # Secrets from GitHub
-      DB_HOST     = var.db_host
-      DB_NAME     = var.db_name
-      DB_PORT     = var.db_port
+      DB_HOST              = var.db_host
+      DB_NAME              = var.db_name
+      DB_PORT              = var.db_port
       API_KEY              = var.api_key
       SECRET_KEY           = var.secret_key
       DOMAIN_NAME          = var.domain_name
       EPC_AUTH_TOKEN       = var.epc_auth_token
       GOOGLE_SOLAR_API_KEY = var.google_solar_api_key
 
-      # Buckets
+      # Buckets - from terraform state
       PLAN_TRIGGER_BUCKET             = var.plan_trigger_bucket
       DATA_BUCKET                     = var.data_bucket
       PREDICTIONS_BUCKET              = var.predictions_bucket
-      SAP_PREDICTIONS_BUCKET          = var.sap_predictions_bucket
-      CARBON_PREDICTIONS_BUCKET       = var.carbon_predictions_bucket
-      HEAT_PREDICTIONS_BUCKET         = var.heat_predictions_bucket
-      HEATING_KWH_PREDICTIONS_BUCKET  = var.heating_kwh_predictions_bucket
-      HOTWATER_KWH_PREDICTIONS_BUCKET = var.hotwater_kwh_predictions_bucket
-      ENERGY_ASSESSMENTS_BUCKET       = var.energy_assessments_bucket
+      SAP_PREDICTIONS_BUCKET          = data.terraform_remote_state.shared.outputs.retrofit_sap_predictions_bucket_name
+      CARBON_PREDICTIONS_BUCKET       = data.terraform_remote_state.shared.outputs.retrofit_carbon_predictions_bucket_name
+      HEAT_PREDICTIONS_BUCKET         = data.terraform_remote_state.shared.outputs.retrofit_heat_predictions_bucket_name
+      HEATING_KWH_PREDICTIONS_BUCKET  = data.terraform_remote_state.shared.outputs.retrofit_heating_kwh_predictions_bucket_name
+      HOTWATER_KWH_PREDICTIONS_BUCKET = data.terraform_remote_state.shared.outputs.retrofit_hotwater_kwh_predictions_bucket_name
+      ENERGY_ASSESSMENTS_BUCKET       = data.terraform_remote_state.shared.outputs.retrofit_energy_assessments_bucket_name
 
       # SQS
       ENGINE_SQS_URL         = module.lambda.sqs_queue_url
diff --git a/infrastructure/terraform/lambda/engine/variables.tf b/infrastructure/terraform/lambda/engine/variables.tf
index 189cc848..0a2277ff 100644
--- a/infrastructure/terraform/lambda/engine/variables.tf
+++ b/infrastructure/terraform/lambda/engine/variables.tf
@@ -59,30 +59,6 @@ variable "predictions_bucket" {
   type = string
 }
 
-variable "sap_predictions_bucket" {
-  type = string
-}
-
-variable "carbon_predictions_bucket" {
-  type = string
-}
-
-variable "heat_predictions_bucket" {
-  type = string
-}
-
-variable "heating_kwh_predictions_bucket" {
-  type = string
-}
-
-variable "hotwater_kwh_predictions_bucket" {
-  type = string
-}
-
-variable "energy_assessments_bucket" {
-  type = string
-}
-
 locals {
   image_uri = "${var.ecr_repo_url}@${var.image_digest}"
 }
diff --git a/infrastructure/terraform/shared/main.tf b/infrastructure/terraform/shared/main.tf
index c7ed5a1f..02431802 100644
--- a/infrastructure/terraform/shared/main.tf
+++ b/infrastructure/terraform/shared/main.tf
@@ -134,6 +134,11 @@ module "retrofit_sap_predictions" {
   allowed_origins = var.allowed_origins
 }
 
+output "retrofit_sap_predictions_bucket_name" {
+  value = module.retrofit_sap_predictions.bucket_name
+  description = "Name of the retrofit SAP predictions bucket"
+}
+
 module "retrofit_sap_data" {
   source          = "../modules/s3"
   bucketname      = "retrofit-data-${var.stage}"
@@ -151,12 +156,22 @@ module "retrofit_carbon_predictions" {
   allowed_origins = var.allowed_origins
 }
 
+output "retrofit_carbon_predictions_bucket_name" {
+  value = module.retrofit_carbon_predictions.bucket_name
+  description = "Name of the retrofit carbon predictions bucket"
+}
+
 module "retrofit_heat_predictions" {
   source          = "../modules/s3"
   bucketname      = "retrofit-heat-predictions-${var.stage}"
   allowed_origins = var.allowed_origins
 }
 
+output "retrofit_heat_predictions_bucket_name" {
+  value = module.retrofit_heat_predictions.bucket_name
+  description = "Name of the retrofit heat predictions bucket"
+}
+
 module "retrofit_lighting_cost_predictions" {
   source          = "../modules/s3"
   bucketname      = "retrofit-lighting-cost-predictions-${var.stage}"
@@ -181,12 +196,22 @@ module "retrofit_heating_kwh_predictions" {
   allowed_origins = var.allowed_origins
 }
 
+output "retrofit_heating_kwh_predictions_bucket_name" {
+  value = module.retrofit_heating_kwh_predictions.bucket_name
+  description = "Name of the retrofit heating kWh predictions bucket"
+}
+
 module "retrofit_hotwater_kwh_predictions" {
   source          = "../modules/s3"
   bucketname      = "retrofit-hotwater-kwh-predictions-${var.stage}"
   allowed_origins = var.allowed_origins
 }
 
+output "retrofit_hotwater_kwh_predictions_bucket_name" {
+  value = module.retrofit_hotwater_kwh_predictions.bucket_name
+  description = "Name of the retrofit hotwater kWh predictions bucket"
+}
+
 module "retrofit_sap_baseline_predictions" {
   source          = "../modules/s3"
   bucketname      = "retrofit-sap-baseline-predictions-${var.stage}"
@@ -201,6 +226,11 @@ module "retrofit_energy_assessments" {
   environment     = var.stage
 }
 
+output "retrofit_energy_assessments_bucket_name" {
+  value = module.retrofit_energy_assessments.bucket_name
+  description = "Name of the retrofit energy assessments bucket"
+}
+
 # Set up the route53 record for the API
 module "route53" {
   source         = "../modules/route53"