diff --git a/infrastructure/terraform/lambda/categorisation/outputs.tf b/infrastructure/terraform/lambda/categorisation/outputs.tf
new file mode 100644
index 00000000..be1ac118
--- /dev/null
+++ b/infrastructure/terraform/lambda/categorisation/outputs.tf
@@ -0,0 +1,9 @@
+output "categorisation_queue_url" {
+    value       = module.lambda.queu_url
+    description = "URL of the Categorisation SQS queue"
+}
+
+output "categorisation_queue_arn" {
+    value       = module.lambda.queu_arn
+    description = "ARN of the Categorisation SQS queue"
+}
\ No newline at end of file
diff --git a/infrastructure/terraform/lambda/engine/outputs.tf b/infrastructure/terraform/lambda/engine/outputs.tf
new file mode 100644
index 00000000..bba2046b
--- /dev/null
+++ b/infrastructure/terraform/lambda/engine/outputs.tf
@@ -0,0 +1,9 @@
+output "ara_engine_queue_url" {
+    value       = module.lambda.queu_url
+    description = "URL of the Engine SQS queue"
+}
+
+output "ara_engine_queue_arn" {
+    value       = module.lambda.queu_arn
+    description = "ARN of the Engine SQS queue"
+}
\ No newline at end of file
diff --git a/infrastructure/terraform/lambda/fast-api/main.tf b/infrastructure/terraform/lambda/fast-api/main.tf
index aabc1c52..82d2cc60 100644
--- a/infrastructure/terraform/lambda/fast-api/main.tf
+++ b/infrastructure/terraform/lambda/fast-api/main.tf
@@ -7,6 +7,24 @@ data "terraform_remote_state" "shared" {
   }
 }
 
+data "terraform_remote_state" "engine" {
+  backend = "s3"
+  config = {
+    bucket = "ara-engine-terraform-state",
+    key = "env:/${var.stage}/teraform.tfstate"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "categorisation" {
+  backend = "s3"
+  config = {
+    bucket = "categorisation-terraform-state",
+    key = "env:/${var.stage}/teraform.tfstate"
+    region = "eu-west-2"
+  }
+}
+
 data "aws_secretsmanager_secret_version" "db_credentials" {
   secret_id = "${var.stage}/assessment_model/db_credentials"
 }
@@ -88,8 +106,8 @@ module "fastapi" {
     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
 
-    ENGINE_SQS_URL         = data.terraform_remote_state.shared.outputs.engine_queue_url
-    CATEGORISATION_SQS_URL = "https://sqs.eu-west-2.amazonaws.com/337213553626/categorisation-queue-dev"
+    ENGINE_SQS_URL         = data.terraform_remote_state.engine.ara_engine_queue_url
+    CATEGORISATION_SQS_URL = data.terraform_remote_state.categorisation.categorisation_queue_url
   }
 }