diff --git a/.github/workflows/pr_ms.yml b/.github/workflows/pr_ms.yml
index cf5cef99..e966f2c3 100644
--- a/.github/workflows/pr_ms.yml
+++ b/.github/workflows/pr_ms.yml
@@ -1,4 +1,5 @@
 name: Code Review dashboard-backend
+
 on:
   workflow_dispatch:
 
@@ -7,20 +8,11 @@ on:
       - main
       - releases/**
     types:
+      - opened
+      - edited
       - synchronize
       - reopened
       - ready_for_review
-    paths:
-      - '.github/workflows/pr_ms.yml'
-      - '.github/workflows/release_ms.yml'
-      - '.github/workflows/release_ms_pnpg.yml'
-      - '!.devops/**'
-      - '!helm/**'
-      - '!**.md'
-      - '!**ignore'
-      - '!infra/**'
-      - '!.terraform-version'
-      - '!CODEOWNERS'
 
 jobs:
 
diff --git a/helm/pnpg/values-dev.yaml b/helm/pnpg/values-dev.yaml
index 223a96f8..f5adaaa6 100644
--- a/helm/pnpg/values-dev.yaml
+++ b/helm/pnpg/values-dev.yaml
@@ -31,4 +31,4 @@ configEnvSpecific:
   JWT_TOKEN_EXCHANGE_ISSUER: "https://pnpg.dev.selfcare.pagopa.it"
   PUBLIC_FILE_STORAGE_BASE_URL: "https://selcdweupnpgcheckoutsa.z6.web.core.windows.net"
   JWT_ISSUER: "https://hub-login.spid.dev.pn.pagopa.it"
-  SELFCARE_USER_URL: "https://selc-d-pnpg-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+  SELFCARE_USER_URL: "https://selc-d-pnpg-user-ms-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
diff --git a/helm/pnpg/values-prod.yaml b/helm/pnpg/values-prod.yaml
index 51034f67..1da32b98 100644
--- a/helm/pnpg/values-prod.yaml
+++ b/helm/pnpg/values-prod.yaml
@@ -30,4 +30,4 @@ configEnvSpecific:
   REST_CLIENT_LOGGER_LEVEL: "BASIC"
   JWT_TOKEN_EXCHANGE_ISSUER: "https://pnpg.selfcare.pagopa.it"
   PUBLIC_FILE_STORAGE_BASE_URL: "https://selcpweupnpgcheckoutsa.z6.web.core.windows.net"
-  SELFCARE_USER_URL: "https://selc-p-pnpg-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
\ No newline at end of file
+  SELFCARE_USER_URL: "https://selc-p-pnpg-user-ms-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
\ No newline at end of file
diff --git a/helm/pnpg/values-uat.yaml b/helm/pnpg/values-uat.yaml
index 8832a5c9..7488d626 100644
--- a/helm/pnpg/values-uat.yaml
+++ b/helm/pnpg/values-uat.yaml
@@ -31,4 +31,4 @@ configEnvSpecific:
   REST_CLIENT_LOGGER_LEVEL: "FULL"
   JWT_TOKEN_EXCHANGE_ISSUER: "https://pnpg.uat.selfcare.pagopa.it"
   PUBLIC_FILE_STORAGE_BASE_URL: "https://selcuweupnpgcheckoutsa.z6.web.core.windows.net"
-  SELFCARE_USER_URL: "https://selc-u-pnpg-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
\ No newline at end of file
+  SELFCARE_USER_URL: "https://selc-u-pnpg-user-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io"
\ No newline at end of file
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
index ae406270..8985a8ef 100644
--- a/helm/values-dev.yaml
+++ b/helm/values-dev.yaml
@@ -42,4 +42,4 @@ configEnvSpecific:
   JWT_TOKEN_EXCHANGE_ISSUER: "https://dev.selfcare.pagopa.it"
   PUBLIC_FILE_STORAGE_BASE_URL: "https://selcdcheckoutsa.z6.web.core.windows.net"
   PAGO_PA_BACKOFFICE_URL: "https://api.dev.platform.pagopa.it/apiconfig/auth/api/v1"
-  SELFCARE_USER_URL: "https://selc-d-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+  SELFCARE_USER_URL: "https://selc-d-user-ms-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
index d86035e7..d67b9375 100644
--- a/helm/values-prod.yaml
+++ b/helm/values-prod.yaml
@@ -45,4 +45,4 @@ configEnvSpecific:
   JWT_TOKEN_EXCHANGE_ISSUER: "https://selfcare.pagopa.it"
   PUBLIC_FILE_STORAGE_BASE_URL: "https://selcpcheckoutsa.z6.web.core.windows.net"
   PAGO_PA_BACKOFFICE_URL: "https://api.platform.pagopa.it/apiconfig/auth/api/v1"
-  SELFCARE_USER_URL: "https://selc-p-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
\ No newline at end of file
+  SELFCARE_USER_URL: "https://selc-p-user-ms-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
\ No newline at end of file
diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
index f596d91e..24ff4747 100644
--- a/helm/values-uat.yaml
+++ b/helm/values-uat.yaml
@@ -43,4 +43,4 @@ configEnvSpecific:
   JWT_TOKEN_EXCHANGE_ISSUER: "https://uat.selfcare.pagopa.it"
   PUBLIC_FILE_STORAGE_BASE_URL: "https://selcucheckoutsa.z6.web.core.windows.net"
   PAGO_PA_BACKOFFICE_URL: "https://api.uat.platform.pagopa.it/apiconfig/auth/api/v1"
-  SELFCARE_USER_URL: "https://selc-u-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
\ No newline at end of file
+  SELFCARE_USER_URL: "https://selc-u-user-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io"
\ No newline at end of file
diff --git a/infra/container_apps/README.md b/infra/container_apps/README.md
index 43cca768..3176f828 100644
--- a/infra/container_apps/README.md
+++ b/infra/container_apps/README.md
@@ -12,29 +12,40 @@ Deploy container on a Container App instance.
 
 ## Providers
 
-No providers.
+| Name | Version |
+|------|---------|
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.85.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_apim_api_bff_dashboard"></a> [apim\_api\_bff\_dashboard](#module\_apim\_api\_bff\_dashboard) | github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v7.50.1 |
 | <a name="module_container_app_dashboard_backend"></a> [container\_app\_dashboard\_backend](#module\_container\_app\_dashboard\_backend) | github.com/pagopa/selfcare-commons//infra/terraform-modules/container_app_microservice | main |
 
 ## Resources
 
-No resources.
+| Name | Type |
+|------|------|
+| [azurerm_api_management_api_version_set.apim_api_bff_dashboard](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_version_set) | resource |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_api_dns_zone_prefix"></a> [api\_dns\_zone\_prefix](#input\_api\_dns\_zone\_prefix) | The dns subdomain. | `string` | `"api.selfcare"` | no |
 | <a name="input_app_settings"></a> [app\_settings](#input\_app\_settings) | n/a | <pre>list(object({<br>    name  = string<br>    value = string<br>  }))</pre> | n/a | yes |
+| <a name="input_cae_name"></a> [cae\_name](#input\_cae\_name) | Container App Environment name | `string` | `"cae-cp"` | no |
 | <a name="input_container_app"></a> [container\_app](#input\_container\_app) | Container App configuration | <pre>object({<br>    min_replicas = number<br>    max_replicas = number<br><br>    scale_rules = list(object({<br>      name = string<br>      custom = object({<br>        metadata = map(string)<br>        type     = string<br>      })<br>    }))<br><br>    cpu    = number<br>    memory = string<br>  })</pre> | n/a | yes |
+| <a name="input_dns_zone_prefix"></a> [dns\_zone\_prefix](#input\_dns\_zone\_prefix) | The dns subdomain. | `string` | `"selfcare"` | no |
 | <a name="input_env_short"></a> [env\_short](#input\_env\_short) | Environment short name | `string` | n/a | yes |
+| <a name="input_external_domain"></a> [external\_domain](#input\_external\_domain) | Domain for delegation | `string` | `"pagopa.it"` | no |
 | <a name="input_image_tag"></a> [image\_tag](#input\_image\_tag) | Image tag to use for the container | `string` | `"latest"` | no |
 | <a name="input_is_pnpg"></a> [is\_pnpg](#input\_is\_pnpg) | (Optional) True if you want to apply changes to PNPG environment | `bool` | `false` | no |
-| <a name="input_secrets_names"></a> [secrets\_names](#input\_secrets\_names) | KeyVault secrets to get values from | `list(string)` | n/a | yes |
+| <a name="input_private_dns_name"></a> [private\_dns\_name](#input\_private\_dns\_name) | Container Apps private DNS record | `string` | n/a | yes |
+| <a name="input_secrets_names"></a> [secrets\_names](#input\_secrets\_names) | KeyVault secrets to get values from | `map(string)` | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(any)` | n/a | yes |
+| <a name="input_workload_profile_name"></a> [workload\_profile\_name](#input\_workload\_profile\_name) | Workload Profile name to use | `string` | `null` | no |
 
 ## Outputs
 
diff --git a/infra/container_apps/apim.tf b/infra/container_apps/apim.tf
index f804a3f9..765b1625 100644
--- a/infra/container_apps/apim.tf
+++ b/infra/container_apps/apim.tf
@@ -1,9 +1,9 @@
 locals {
-    apim_name       = format("selc-%s-apim", var.env_short)
-    apim_rg         = format("selc-%s-api-rg", var.env_short)
-    api_name        = var.is_pnpg ? format("selc-%s-pnpg-api-bff-dashboard", var.env_short) : format("selc-%s-api-bff-dashboard", var.env_short)
-    display_name    = var.is_pnpg ? "BFF PNPG Dashboard API" : "BFF Dashboard API"
-    base_path       = var.is_pnpg ? "imprese/dashboard" : "dashboard"
+  apim_name    = format("selc-%s-apim", var.env_short)
+  apim_rg      = format("selc-%s-api-rg", var.env_short)
+  api_name     = var.is_pnpg ? format("selc-%s-pnpg-api-bff-dashboard", var.env_short) : format("selc-%s-api-bff-dashboard", var.env_short)
+  display_name = var.is_pnpg ? "BFF PNPG Dashboard API" : "BFF Dashboard API"
+  base_path    = var.is_pnpg ? "imprese/dashboard" : "dashboard"
 }
 
 
@@ -33,9 +33,9 @@ module "apim_api_bff_dashboard" {
   service_url = format("https://%s", var.private_dns_name)
 
   content_format = "openapi+json"
-  content_value  = templatefile("../../app/src/main/resources/swagger/api-docs.json", {
-    url        = format("%s.%s", var.api_dns_zone_prefix, var.external_domain)
-    basePath   = local.base_path
+  content_value = templatefile("../../app/src/main/resources/swagger/api-docs.json", {
+    url      = format("%s.%s", var.api_dns_zone_prefix, var.external_domain)
+    basePath = local.base_path
   })
 
   subscription_required = false
diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars
index af4b2542..9bcf301d 100644
--- a/infra/container_apps/env/dev-pnpg/terraform.tfvars
+++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars
@@ -1,8 +1,8 @@
 is_pnpg   = true
 env_short = "d"
 
-private_dns_name = "selc-d-pnpg-dashboard-backend-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
-dns_zone_prefix    = "pnpg.dev.selfcare"
+private_dns_name    = "selc-d-pnpg-dashboard-backend-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
+dns_zone_prefix     = "pnpg.dev.selfcare"
 api_dns_zone_prefix = "api-pnpg.dev.selfcare"
 
 tags = {
@@ -30,8 +30,8 @@ container_app = {
       name = "cron-scale-rule"
     }
   ]
-  cpu          = 0.5
-  memory       = "1Gi"
+  cpu    = 0.5
+  memory = "1Gi"
 }
 
 app_settings = [
@@ -89,23 +89,23 @@ app_settings = [
   },
   {
     name  = "MS_CORE_URL"
-    value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-pnpg-ms-core-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"
-    value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-pnpg-ms-core-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_REGISTRY_PROXY_URL"
-    value = "https://selc-d-pnpg-party-reg-proxy-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-pnpg-party-reg-proxy-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_PRODUCT_URL"
-    value = "https://selc-d-pnpg-product-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-pnpg-product-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_USER_GROUP_URL"
-    value = "https://selc-d-pnpg-user-group-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-pnpg-user-group-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_USER_REGISTRY_URL"
@@ -120,12 +120,12 @@ app_settings = [
     value = "https://dev.portalefatturazione.pagopa.it/auth?selfcareToken=<IdentityToken>"
   },
   {
-    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE" 
+    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE"
     value = "dev.portalefatturazione.pagopa.it"
   },
   {
-      name  = "SELFCARE_USER_URL"
-      value = "https://selc-d-pnpg-user-ms-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
+    name  = "SELFCARE_USER_URL"
+    value = "https://selc-d-pnpg-user-ms-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io"
   },
   {
     name  = "B4F_DASHBOARD_SECURITY_CONNECTOR"
@@ -134,12 +134,12 @@ app_settings = [
 ]
 
 secrets_names = {
-    "APPLICATIONINSIGHTS_CONNECTION_STRING"           = "appinsights-connection-string"
-    "BLOB_STORAGE_CONN_STRING"                        = "web-storage-connection-string"
-    "USER_REGISTRY_API_KEY"                           = "user-registry-api-key"
-    "SUPPORT_API_KEY"                                 = "zendesk-support-api-key"
-    "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"                  = "jwt-exchange-private-key"
-    "JWT_TOKEN_EXCHANGE_KID"                          = "jwt-exchange-kid"
-    "JWT_TOKEN_PUBLIC_KEY"                            = "jwt-public-key"
-    "USERVICE_USER_REGISTRY_API_KEY"                  = "user-registry-api-key"
+  "APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
+  "BLOB_STORAGE_CONN_STRING"              = "web-storage-connection-string"
+  "USER_REGISTRY_API_KEY"                 = "user-registry-api-key"
+  "SUPPORT_API_KEY"                       = "zendesk-support-api-key"
+  "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"        = "jwt-exchange-private-key"
+  "JWT_TOKEN_EXCHANGE_KID"                = "jwt-exchange-kid"
+  "JWT_TOKEN_PUBLIC_KEY"                  = "jwt-public-key"
+  "USERVICE_USER_REGISTRY_API_KEY"        = "user-registry-api-key"
 }
diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars
index 3965bd97..1d3acfeb 100644
--- a/infra/container_apps/env/dev/terraform.tfvars
+++ b/infra/container_apps/env/dev/terraform.tfvars
@@ -1,5 +1,5 @@
 env_short           = "d"
-private_dns_name    = "selc-d-dashboard-backend-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+private_dns_name    = "selc-d-dashboard-backend-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
 dns_zone_prefix     = "dev.selfcare"
 api_dns_zone_prefix = "api.dev.selfcare"
 
@@ -28,8 +28,8 @@ container_app = {
       name = "cron-scale-rule"
     }
   ]
-  cpu          = 0.5
-  memory       = "1Gi"
+  cpu    = 0.5
+  memory = "1Gi"
 }
 
 app_settings = [
@@ -87,23 +87,23 @@ app_settings = [
   },
   {
     name  = "MS_CORE_URL"
-    value = "https://selc-d-ms-core-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-ms-core-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"
-    value = "https://selc-d-ms-core-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-ms-core-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_REGISTRY_PROXY_URL"
-    value = "https://selc-d-party-reg-proxy-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-party-reg-proxy-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_PRODUCT_URL"
-    value = "https://selc-d-product-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-product-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_USER_GROUP_URL"
-    value = "https://selc-d-user-group-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
+    value = "https://selc-d-user-group-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_USER_REGISTRY_URL"
@@ -118,13 +118,13 @@ app_settings = [
     value = "https://dev.portalefatturazione.pagopa.it/auth?selfcareToken=<IdentityToken>"
   },
   {
-    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE" 
+    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE"
     value = "dev.portalefatturazione.pagopa.it"
   },
   {
-   name  = "SELFCARE_USER_URL"
-   value = "https://selc-d-user-ms-ca.livelydesert-633675bb.westeurope.azurecontainerapps.io"
- },
+    name  = "SELFCARE_USER_URL"
+    value = "https://selc-d-user-ms-ca.politewater-9af33050.westeurope.azurecontainerapps.io"
+  },
   {
     name  = "B4F_DASHBOARD_SECURITY_CONNECTOR"
     value = "v1"
@@ -132,13 +132,13 @@ app_settings = [
 ]
 
 secrets_names = {
-    "APPLICATIONINSIGHTS_CONNECTION_STRING"           = "appinsights-connection-string"
-    "BLOB_STORAGE_CONN_STRING"                        = "web-storage-connection-string"
-    "USER_REGISTRY_API_KEY"                           = "user-registry-api-key"
-    "BACKOFFICE_PAGO_PA_API_KEY"                      = "pagopa-backoffice-api-key"
-    "SUPPORT_API_KEY"                                 = "zendesk-support-api-key"
-    "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"                  = "jwt-exchange-private-key"
-    "JWT_TOKEN_EXCHANGE_KID"                          = "jwt-exchange-kid"
-    "JWT_TOKEN_PUBLIC_KEY"                            = "jwt-public-key"
-    "USERVICE_USER_REGISTRY_API_KEY"                  = "user-registry-api-key"
+  "APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
+  "BLOB_STORAGE_CONN_STRING"              = "web-storage-connection-string"
+  "USER_REGISTRY_API_KEY"                 = "user-registry-api-key"
+  "BACKOFFICE_PAGO_PA_API_KEY"            = "pagopa-backoffice-api-key"
+  "SUPPORT_API_KEY"                       = "zendesk-support-api-key"
+  "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"        = "jwt-exchange-private-key"
+  "JWT_TOKEN_EXCHANGE_KID"                = "jwt-exchange-kid"
+  "JWT_TOKEN_PUBLIC_KEY"                  = "jwt-public-key"
+  "USERVICE_USER_REGISTRY_API_KEY"        = "user-registry-api-key"
 }
diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars
index ff98414f..cade09da 100644
--- a/infra/container_apps/env/prod-pnpg/terraform.tfvars
+++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars
@@ -1,7 +1,7 @@
-is_pnpg   = true
-env_short = "p"
-private_dns_name = "selc-p-pnpg-dashboard-backend-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
-dns_zone_prefix    = "imprese.notifichedigitali"
+is_pnpg             = true
+env_short           = "p"
+private_dns_name    = "selc-p-pnpg-dashboard-backend-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
+dns_zone_prefix     = "imprese.notifichedigitali"
 api_dns_zone_prefix = "api-pnpg.selfcare"
 external_domain     = "it"
 
@@ -89,23 +89,23 @@ app_settings = [
   },
   {
     name  = "MS_CORE_URL"
-    value = "https://selc-p-pnpg-ms-core-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-pnpg-ms-core-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"
-    value = "https://selc-p-pnpg-ms-core-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-pnpg-ms-core-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_REGISTRY_PROXY_URL"
-    value = "https://selc-p-pnpg-party-reg-proxy-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-pnpg-party-reg-proxy-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_PRODUCT_URL"
-    value = "https://selc-p-pnpg-product-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-pnpg-product-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_USER_GROUP_URL"
-    value = "https://selc-p-pnpg-user-group-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-pnpg-user-group-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_USER_REGISTRY_URL"
@@ -120,12 +120,12 @@ app_settings = [
     value = "https://portalefatturazione.pagopa.it/auth?selfcareToken=<IdentityToken>"
   },
   {
-    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE" 
+    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE"
     value = "portalefatturazione.pagopa.it"
   },
   {
-      name  = "SELFCARE_USER_URL"
-      value = "https://selc-p-pnpg-user-ms-ca.redbeach-5da5166f.westeurope.azurecontainerapps.io"
+    name  = "SELFCARE_USER_URL"
+    value = "https://selc-p-pnpg-user-ms-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io"
   },
   {
     name  = "B4F_DASHBOARD_SECURITY_CONNECTOR"
@@ -134,12 +134,12 @@ app_settings = [
 ]
 
 secrets_names = {
-    "APPLICATIONINSIGHTS_CONNECTION_STRING"           = "appinsights-connection-string"
-    "BLOB_STORAGE_CONN_STRING"                        = "web-storage-connection-string"
-    "USER_REGISTRY_API_KEY"                           = "user-registry-api-key"
-    "SUPPORT_API_KEY"                                 = "zendesk-support-api-key"
-    "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"                  = "jwt-exchange-private-key"
-    "JWT_TOKEN_EXCHANGE_KID"                          = "jwt-exchange-kid"
-    "JWT_TOKEN_PUBLIC_KEY"                            = "jwt-public-key"
-    "USERVICE_USER_REGISTRY_API_KEY"                  = "user-registry-api-key"
+  "APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
+  "BLOB_STORAGE_CONN_STRING"              = "web-storage-connection-string"
+  "USER_REGISTRY_API_KEY"                 = "user-registry-api-key"
+  "SUPPORT_API_KEY"                       = "zendesk-support-api-key"
+  "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"        = "jwt-exchange-private-key"
+  "JWT_TOKEN_EXCHANGE_KID"                = "jwt-exchange-kid"
+  "JWT_TOKEN_PUBLIC_KEY"                  = "jwt-public-key"
+  "USERVICE_USER_REGISTRY_API_KEY"        = "user-registry-api-key"
 }
\ No newline at end of file
diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars
index 68c9e4ee..8e59e562 100644
--- a/infra/container_apps/env/prod/terraform.tfvars
+++ b/infra/container_apps/env/prod/terraform.tfvars
@@ -1,6 +1,6 @@
-env_short = "p"
-private_dns_name = "selc-p-dashboard-backend-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
-dns_zone_prefix    = "selfcare"
+env_short           = "p"
+private_dns_name    = "selc-p-dashboard-backend-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
+dns_zone_prefix     = "selfcare"
 api_dns_zone_prefix = "api.selfcare"
 
 tags = {
@@ -87,23 +87,23 @@ app_settings = [
   },
   {
     name  = "MS_CORE_URL"
-    value = "https://selc-p-ms-core-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-ms-core-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"
-    value = "https://selc-p-ms-core-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-ms-core-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_PARTY_REGISTRY_PROXY_URL"
-    value = "https://selc-p-party-reg-proxy-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-party-reg-proxy-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_PRODUCT_URL"
-    value = "https://selc-p-product-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-product-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_USER_GROUP_URL"
-    value = "https://selc-p-user-group-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
+    value = "https://selc-p-user-group-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
   },
   {
     name  = "USERVICE_USER_REGISTRY_URL"
@@ -118,12 +118,12 @@ app_settings = [
     value = "https://portalefatturazione.pagopa.it/auth?selfcareToken=<IdentityToken>"
   },
   {
-    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE" 
+    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE"
     value = "portalefatturazione.pagopa.it"
   },
   {
-      name  = "SELFCARE_USER_URL"
-      value = "https://selc-p-user-ms-ca.salmonstone-7f910b8f.westeurope.azurecontainerapps.io"
+    name  = "SELFCARE_USER_URL"
+    value = "https://selc-p-user-ms-ca.greensand-62fc96da.westeurope.azurecontainerapps.io"
   },
   {
     name  = "B4F_DASHBOARD_SECURITY_CONNECTOR"
@@ -132,13 +132,13 @@ app_settings = [
 ]
 
 secrets_names = {
-    "APPLICATIONINSIGHTS_CONNECTION_STRING"           = "appinsights-connection-string"
-    "BLOB_STORAGE_CONN_STRING"                        = "web-storage-connection-string"
-    "USER_REGISTRY_API_KEY"                           = "user-registry-api-key"
-    "BACKOFFICE_PAGO_PA_API_KEY"                      = "pagopa-backoffice-api-key"
-    "SUPPORT_API_KEY"                                 = "zendesk-support-api-key"
-    "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"                  = "jwt-exchange-private-key"
-    "JWT_TOKEN_EXCHANGE_KID"                          = "jwt-exchange-kid"
-    "JWT_TOKEN_PUBLIC_KEY"                            = "jwt-public-key"
-    "USERVICE_USER_REGISTRY_API_KEY"                  = "user-registry-api-key"
+  "APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
+  "BLOB_STORAGE_CONN_STRING"              = "web-storage-connection-string"
+  "USER_REGISTRY_API_KEY"                 = "user-registry-api-key"
+  "BACKOFFICE_PAGO_PA_API_KEY"            = "pagopa-backoffice-api-key"
+  "SUPPORT_API_KEY"                       = "zendesk-support-api-key"
+  "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"        = "jwt-exchange-private-key"
+  "JWT_TOKEN_EXCHANGE_KID"                = "jwt-exchange-kid"
+  "JWT_TOKEN_PUBLIC_KEY"                  = "jwt-public-key"
+  "USERVICE_USER_REGISTRY_API_KEY"        = "user-registry-api-key"
 }
\ No newline at end of file
diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars
index ffd29383..29449af6 100644
--- a/infra/container_apps/env/uat-pnpg/terraform.tfvars
+++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars
@@ -1,9 +1,11 @@
-is_pnpg   = true
-env_short = "u"
-private_dns_name   = "selc-u-pnpg-dashboard-backend-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io"
-dns_zone_prefix    = "imprese.uat.notifichedigitali"
-api_dns_zone_prefix = "api-pnpg.uat.selfcare"
-external_domain     = "it"
+is_pnpg               = true
+env_short             = "u"
+private_dns_name      = "selc-u-pnpg-dashboard-backend-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io"
+dns_zone_prefix       = "imprese.uat.notifichedigitali"
+api_dns_zone_prefix   = "api-pnpg.uat.selfcare"
+external_domain       = "it"
+cae_name              = "cae"
+workload_profile_name = "Consumption"
 
 tags = {
   CreatedBy   = "Terraform"
@@ -107,12 +109,12 @@ app_settings = [
     value = "https://dev.portalefatturazione.pagopa.it/auth?selfcareToken=<IdentityToken>"
   },
   {
-    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE" 
+    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE"
     value = "dev.portalefatturazione.pagopa.it"
   },
   {
-      name  = "SELFCARE_USER_URL"
-      value = "https://selc-u-pnpg-user-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io"
+    name  = "SELFCARE_USER_URL"
+    value = "https://selc-u-pnpg-user-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io"
   },
   {
     name  = "B4F_DASHBOARD_SECURITY_CONNECTOR"
@@ -121,12 +123,12 @@ app_settings = [
 ]
 
 secrets_names = {
-    "APPLICATIONINSIGHTS_CONNECTION_STRING"           = "appinsights-connection-string"
-    "BLOB_STORAGE_CONN_STRING"                        = "web-storage-connection-string"
-    "USER_REGISTRY_API_KEY"                           = "user-registry-api-key"
-    "SUPPORT_API_KEY"                                 = "zendesk-support-api-key"
-    "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"                  = "jwt-exchange-private-key"
-    "JWT_TOKEN_EXCHANGE_KID"                          = "jwt-exchange-kid"
-    "JWT_TOKEN_PUBLIC_KEY"                            = "jwt-public-key"
-    "USERVICE_USER_REGISTRY_API_KEY"                  = "user-registry-api-key"
+  "APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
+  "BLOB_STORAGE_CONN_STRING"              = "web-storage-connection-string"
+  "USER_REGISTRY_API_KEY"                 = "user-registry-api-key"
+  "SUPPORT_API_KEY"                       = "zendesk-support-api-key"
+  "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"        = "jwt-exchange-private-key"
+  "JWT_TOKEN_EXCHANGE_KID"                = "jwt-exchange-kid"
+  "JWT_TOKEN_PUBLIC_KEY"                  = "jwt-public-key"
+  "USERVICE_USER_REGISTRY_API_KEY"        = "user-registry-api-key"
 }
diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars
index c07437ca..da21e8cb 100644
--- a/infra/container_apps/env/uat/terraform.tfvars
+++ b/infra/container_apps/env/uat/terraform.tfvars
@@ -1,7 +1,9 @@
-env_short = "u"
-private_dns_name = "selc-u-dashboard-backend-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io"
-dns_zone_prefix    = "uat.selfcare"
-api_dns_zone_prefix = "api.uat.selfcare"
+env_short             = "u"
+private_dns_name      = "selc-u-dashboard-backend-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io"
+dns_zone_prefix       = "uat.selfcare"
+api_dns_zone_prefix   = "api.uat.selfcare"
+cae_name              = "cae"
+workload_profile_name = "Consumption"
 
 tags = {
   CreatedBy   = "Terraform"
@@ -105,12 +107,12 @@ app_settings = [
     value = "https://dev.portalefatturazione.pagopa.it/auth?selfcareToken=<IdentityToken>"
   },
   {
-    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE" 
+    name  = "TOKEN_EXCHANGE_BILLING_AUDIENCE"
     value = "dev.portalefatturazione.pagopa.it"
   },
   {
-      name  = "SELFCARE_USER_URL"
-      value = "https://selc-u-user-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io"
+    name  = "SELFCARE_USER_URL"
+    value = "https://selc-u-user-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io"
   },
   {
     name  = "B4F_DASHBOARD_SECURITY_CONNECTOR"
@@ -119,13 +121,13 @@ app_settings = [
 ]
 
 secrets_names = {
-    "APPLICATIONINSIGHTS_CONNECTION_STRING"           = "appinsights-connection-string"
-    "BLOB_STORAGE_CONN_STRING"                        = "web-storage-connection-string"
-    "USER_REGISTRY_API_KEY"                           = "user-registry-api-key"
-    "BACKOFFICE_PAGO_PA_API_KEY"                      = "pagopa-backoffice-api-key"
-    "SUPPORT_API_KEY"                                 = "zendesk-support-api-key"
-    "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"                  = "jwt-exchange-private-key"
-    "JWT_TOKEN_EXCHANGE_KID"                          = "jwt-exchange-kid"
-    "JWT_TOKEN_PUBLIC_KEY"                            = "jwt-public-key"
-    "USERVICE_USER_REGISTRY_API_KEY"                  = "user-registry-api-key"
+  "APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
+  "BLOB_STORAGE_CONN_STRING"              = "web-storage-connection-string"
+  "USER_REGISTRY_API_KEY"                 = "user-registry-api-key"
+  "BACKOFFICE_PAGO_PA_API_KEY"            = "pagopa-backoffice-api-key"
+  "SUPPORT_API_KEY"                       = "zendesk-support-api-key"
+  "JWT_TOKEN_EXCHANGE_PRIVATE_KEY"        = "jwt-exchange-private-key"
+  "JWT_TOKEN_EXCHANGE_KID"                = "jwt-exchange-kid"
+  "JWT_TOKEN_PUBLIC_KEY"                  = "jwt-public-key"
+  "USERVICE_USER_REGISTRY_API_KEY"        = "user-registry-api-key"
 }
diff --git a/infra/container_apps/locals.tf b/infra/container_apps/locals.tf
new file mode 100644
index 00000000..919eaef8
--- /dev/null
+++ b/infra/container_apps/locals.tf
@@ -0,0 +1,6 @@
+locals {
+  pnpg_suffix = var.is_pnpg == true ? "-pnpg" : ""
+  project     = "selc-${var.env_short}"
+
+  container_app_environment_name = "${local.project}${local.pnpg_suffix}-${var.cae_name}"
+}
\ No newline at end of file
diff --git a/infra/container_apps/main.tf b/infra/container_apps/main.tf
index 94a0319f..d062b850 100644
--- a/infra/container_apps/main.tf
+++ b/infra/container_apps/main.tf
@@ -13,13 +13,15 @@ module "container_app_dashboard_backend" {
 
   is_pnpg = var.is_pnpg
 
-  env_short          = var.env_short
-  container_app      = var.container_app
-  container_app_name = "dashboard-backend"
-  image_name         = "selfcare-dashboard-backend"
-  image_tag          = var.image_tag
-  app_settings       = var.app_settings
-  secrets_names      = var.secrets_names
+  env_short                      = var.env_short
+  container_app                  = var.container_app
+  container_app_name             = "dashboard-backend"
+  container_app_environment_name = local.container_app_environment_name
+  image_name                     = "selfcare-dashboard-backend"
+  image_tag                      = var.image_tag
+  app_settings                   = var.app_settings
+  secrets_names                  = var.secrets_names
+  workload_profile_name          = var.workload_profile_name
 
   tags = var.tags
 }
diff --git a/infra/container_apps/variables.tf b/infra/container_apps/variables.tf
index 68a6cb88..8998e447 100644
--- a/infra/container_apps/variables.tf
+++ b/infra/container_apps/variables.tf
@@ -78,3 +78,15 @@ variable "api_dns_zone_prefix" {
   default     = "api.selfcare"
   description = "The dns subdomain."
 }
+
+variable "workload_profile_name" {
+  type        = string
+  description = "Workload Profile name to use"
+  default     = null
+}
+
+variable "cae_name" {
+  type        = string
+  description = "Container App Environment name"
+  default     = "cae-cp"
+}