diff --git a/infrastructure/terraform/lambda/address2UPRN/main.tf b/infrastructure/terraform/lambda/address2UPRN/main.tf
index 79e2bb2f..5f0c4a11 100644
--- a/infrastructure/terraform/lambda/address2UPRN/main.tf
+++ b/infrastructure/terraform/lambda/address2UPRN/main.tf
@@ -41,7 +41,7 @@ module "address2uprn" {
       DATA_BUCKET = "test"
       ENGINE_SQS_URL = "test"
       ENERGY_ASSESSMENTS_BUCKET = "test"
-      S3_BUCKET_NAME = data.terraform_remote_state.retrofit_sap_data.outputs.bucket_name
+      S3_BUCKET_NAME = data.terraform_remote_state.shared.outputs.retrofit_sap_data_bucket_name
     },
   )
 }
diff --git a/infrastructure/terraform/shared/main.tf b/infrastructure/terraform/shared/main.tf
index 9733f5f9..eb2a679d 100644
--- a/infrastructure/terraform/shared/main.tf
+++ b/infrastructure/terraform/shared/main.tf
@@ -133,6 +133,11 @@ module "retrofit_sap_data" {
   allowed_origins = var.allowed_origins
 }
 
+output "retrofit_sap_data_bucket_name" {
+  value = module.retrofit_sap_data.bucket_name
+  description = "Name of the retrofit SAP data bucket"
+}
+
 module "retrofit_carbon_predictions" {
   source          = "../modules/s3"
   bucketname      = "retrofit-carbon-predictions-${var.stage}"