diff --git a/src/common/_modules/app_backend/data_kv.tf b/src/common/_modules/app_backend/data_kv.tf
index e87534d85..48fd2b425 100644
--- a/src/common/_modules/app_backend/data_kv.tf
+++ b/src/common/_modules/app_backend/data_kv.tf
@@ -149,4 +149,4 @@ data "azurerm_key_vault_secret" "app_backend_PRE_SHARED_KEY" {
 data "azurerm_key_vault_secret" "app_backend_TRIAL_SYSTEM_APIM_KEY" {
   name         = "appbackend-TRIAL-SYSTEM-APIM-KEY"
   key_vault_id = var.key_vault_common.id
-}
\ No newline at end of file
+}
diff --git a/src/common/prod/README.md b/src/common/prod/README.md
index dd9c87193..1a9c8286b 100644
--- a/src/common/prod/README.md
+++ b/src/common/prod/README.md
@@ -30,7 +30,7 @@
 | [azurerm_resource_group.github_runner](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource |
 | [azurerm_api_management.trial_system](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/api_management) | data source |
 | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source |
-| [azurerm_linux_function_app.app_messages](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
+| [azurerm_linux_function_app.app_messages_xl](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
 | [azurerm_linux_function_app.eucovidcert](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
 | [azurerm_linux_function_app.function_assets_cdn](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
 | [azurerm_linux_function_app.function_cgn](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
diff --git a/src/common/prod/data.tf b/src/common/prod/data.tf
index bfe0800d0..502d4208a 100644
--- a/src/common/prod/data.tf
+++ b/src/common/prod/data.tf
@@ -55,10 +55,10 @@ data "azurerm_linux_function_app" "function_profile" {
   resource_group_name = "${local.project_itn}-profile-rg-0${count.index + 1}"
 }
 
-data "azurerm_linux_function_app" "app_messages" {
+data "azurerm_linux_function_app" "app_messages_xl" {
   count               = local.app_messages_count
-  name                = "${local.project_weu_legacy}-app-messages-fn-${count.index + 1}"
-  resource_group_name = "${local.project_weu_legacy}-app-messages-rg-${count.index + 1}"
+  name                = "${local.project_weu_legacy}-weu-com-citizen-func-0${count.index + 1}"
+  resource_group_name = "${local.project_weu_legacy}-weu-com-rg-01"
 }
 
 data "azurerm_linux_function_app" "services_app_backend_function_app" {
diff --git a/src/common/prod/locals.tf b/src/common/prod/locals.tf
index 30ecec028..a9cf694ea 100644
--- a/src/common/prod/locals.tf
+++ b/src/common/prod/locals.tf
@@ -68,7 +68,7 @@ locals {
 
   backend_hostnames = {
     app                  = [for key, value in data.azurerm_linux_function_app.function_profile : value.default_hostname]
-    app_messages         = [for key, value in data.azurerm_linux_function_app.app_messages : value.default_hostname]
+    app_messages         = [for key, value in data.azurerm_linux_function_app.app_messages_xl : value.default_hostname]
     assets_cdn           = data.azurerm_linux_function_app.function_assets_cdn.default_hostname
     services_app_backend = data.azurerm_linux_function_app.services_app_backend_function_app.default_hostname
     lollipop             = data.azurerm_linux_function_app.lollipop_function.default_hostname
@@ -264,4 +264,3 @@ locals {
     }
   ]
 }
-