diff --git a/infra/container_apps/user-cdc/env/prod-pnpg/terraform.tfvars b/infra/container_apps/user-cdc/env/prod-pnpg/terraform.tfvars
index c91e171c..02503f7b 100644
--- a/infra/container_apps/user-cdc/env/prod-pnpg/terraform.tfvars
+++ b/infra/container_apps/user-cdc/env/prod-pnpg/terraform.tfvars
@@ -1,6 +1,6 @@
 prefix    = "selc"
 env_short = "p"
-is_pnpg          = true
+is_pnpg   = true
 
 tags = {
   CreatedBy   = "Terraform"
diff --git a/infra/container_apps/user-cdc/env/prod/terraform.tfvars b/infra/container_apps/user-cdc/env/prod/terraform.tfvars
index 82a17a14..71fe484e 100644
--- a/infra/container_apps/user-cdc/env/prod/terraform.tfvars
+++ b/infra/container_apps/user-cdc/env/prod/terraform.tfvars
@@ -1,5 +1,7 @@
-prefix    = "selc"
-env_short = "p"
+prefix           = "selc"
+env_short        = "p"
+suffix_increment = "-002"
+cae_name         = "cae-002"
 
 tags = {
   CreatedBy   = "Terraform"
diff --git a/infra/container_apps/user-cdc/main.tf b/infra/container_apps/user-cdc/main.tf
index c16d6cde..01982334 100644
--- a/infra/container_apps/user-cdc/main.tf
+++ b/infra/container_apps/user-cdc/main.tf
@@ -31,9 +31,9 @@ module "container_app_user_cdc" {
         port   = 8080
         scheme = "HTTP"
       }
-      timeoutSeconds   = 5
-      type             = "Liveness"
-      failureThreshold = 3
+      timeoutSeconds      = 5
+      type                = "Liveness"
+      failureThreshold    = 3
       initialDelaySeconds = 1
     },
     {
@@ -42,9 +42,9 @@ module "container_app_user_cdc" {
         port   = 8080
         scheme = "HTTP"
       }
-      timeoutSeconds   = 5
-      type             = "Readiness"
-      failureThreshold = 30
+      timeoutSeconds      = 5
+      type                = "Readiness"
+      failureThreshold    = 30
       initialDelaySeconds = 3
     },
     {
@@ -53,9 +53,9 @@ module "container_app_user_cdc" {
         port   = 8080
         scheme = "HTTP"
       }
-      timeoutSeconds   = 5
-      failureThreshold = 5
-      type             = "Startup"
+      timeoutSeconds      = 5
+      failureThreshold    = 5
+      type                = "Startup"
       initialDelaySeconds = 5
     }
   ]
diff --git a/infra/container_apps/user-group-ms/env/prod/terraform.tfvars b/infra/container_apps/user-group-ms/env/prod/terraform.tfvars
index 819a5081..c5b99c84 100644
--- a/infra/container_apps/user-group-ms/env/prod/terraform.tfvars
+++ b/infra/container_apps/user-group-ms/env/prod/terraform.tfvars
@@ -1,4 +1,6 @@
-env_short = "p"
+env_short        = "p"
+suffix_increment = "-002"
+cae_name         = "cae-002"
 
 tags = {
   CreatedBy   = "Terraform"
diff --git a/infra/container_apps/user-ms/env/dev-pnpg/terraform.tfvars b/infra/container_apps/user-ms/env/dev-pnpg/terraform.tfvars
index 38a5d97a..5c18c1b2 100644
--- a/infra/container_apps/user-ms/env/dev-pnpg/terraform.tfvars
+++ b/infra/container_apps/user-ms/env/dev-pnpg/terraform.tfvars
@@ -55,18 +55,18 @@ app_settings = [
     name  = "EVENTHUB-SC-USERS-SELFCARE-WO-KEY-LC"
     value = "string"
   },
-    {
-      name  = "USER_MS_RETRY_MIN_BACKOFF"
-      value = 5
-    },
-    {
-      name  = "USER_MS_RETRY_MAX_BACKOFF"
-      value = 60
-    },
-    {
-      name  = "USER_MS_RETRY"
-      value = 3
-    }
+  {
+    name  = "USER_MS_RETRY_MIN_BACKOFF"
+    value = 5
+  },
+  {
+    name  = "USER_MS_RETRY_MAX_BACKOFF"
+    value = 60
+  },
+  {
+    name  = "USER_MS_RETRY"
+    value = 3
+  }
 ]
 
 secrets_names = {
diff --git a/infra/container_apps/user-ms/env/dev/terraform.tfvars b/infra/container_apps/user-ms/env/dev/terraform.tfvars
index b3b9b351..672f3aaa 100644
--- a/infra/container_apps/user-ms/env/dev/terraform.tfvars
+++ b/infra/container_apps/user-ms/env/dev/terraform.tfvars
@@ -52,22 +52,22 @@ app_settings = [
     name  = "SHARED_ACCESS_KEY_NAME"
     value = "selfcare-wo"
   },
- {
-   name  = "USER_MS_EVENTHUB_USERS_ENABLED"
-   value = true
- },
- {
-   name  = "USER_MS_RETRY_MIN_BACKOFF"
-   value = 5
- },
- {
-   name  = "USER_MS_RETRY_MAX_BACKOFF"
-   value = 60
- },
- {
-   name  = "USER_MS_RETRY"
-   value = 3
- }
+  {
+    name  = "USER_MS_EVENTHUB_USERS_ENABLED"
+    value = true
+  },
+  {
+    name  = "USER_MS_RETRY_MIN_BACKOFF"
+    value = 5
+  },
+  {
+    name  = "USER_MS_RETRY_MAX_BACKOFF"
+    value = 60
+  },
+  {
+    name  = "USER_MS_RETRY"
+    value = 3
+  }
 ]
 
 secrets_names = {
diff --git a/infra/container_apps/user-ms/env/prod-pnpg/terraform.tfvars b/infra/container_apps/user-ms/env/prod-pnpg/terraform.tfvars
index 2cd6feff..a8e7f5ee 100644
--- a/infra/container_apps/user-ms/env/prod-pnpg/terraform.tfvars
+++ b/infra/container_apps/user-ms/env/prod-pnpg/terraform.tfvars
@@ -47,10 +47,10 @@ app_settings = [
     name  = "EVENTHUB-SC-USERS-SELFCARE-WO-KEY-LC"
     value = "string"
   },
-    {
-      name  = "STORAGE_CONTAINER_PRODUCT"
-      value = "selc-p-product"
-    },
+  {
+    name  = "STORAGE_CONTAINER_PRODUCT"
+    value = "selc-p-product"
+  },
   {
     name  = "USER_REGISTRY_URL"
     value = "https://api.pdv.pagopa.it/user-registry/v1"
diff --git a/infra/container_apps/user-ms/env/prod/terraform.tfvars b/infra/container_apps/user-ms/env/prod/terraform.tfvars
index 17ce34b3..2f280b5d 100644
--- a/infra/container_apps/user-ms/env/prod/terraform.tfvars
+++ b/infra/container_apps/user-ms/env/prod/terraform.tfvars
@@ -1,4 +1,6 @@
-env_short = "p"
+env_short        = "p"
+suffix_increment = "-002"
+cae_name         = "cae-002"
 
 tags = {
   CreatedBy   = "Terraform"
@@ -42,14 +44,14 @@ app_settings = [
     name  = "SHARED_ACCESS_KEY_NAME"
     value = "selfcare-wo"
   },
-    {
-      name  = "USER_MS_EVENTHUB_USERS_ENABLED"
-      value = true
-    },
-    {
-      name  = "STORAGE_CONTAINER_PRODUCT"
-      value = "selc-p-product"
-    },
+  {
+    name  = "USER_MS_EVENTHUB_USERS_ENABLED"
+    value = true
+  },
+  {
+    name  = "STORAGE_CONTAINER_PRODUCT"
+    value = "selc-p-product"
+  },
   {
     name  = "USER_REGISTRY_URL"
     value = "https://api.pdv.pagopa.it/user-registry/v1"
diff --git a/infra/container_apps/user-ms/env/uat-pnpg/terraform.tfvars b/infra/container_apps/user-ms/env/uat-pnpg/terraform.tfvars
index 447670dc..dd4a6a4b 100644
--- a/infra/container_apps/user-ms/env/uat-pnpg/terraform.tfvars
+++ b/infra/container_apps/user-ms/env/uat-pnpg/terraform.tfvars
@@ -44,22 +44,22 @@ app_settings = [
     name  = "EVENTHUB-SC-USERS-SELFCARE-WO-KEY-LC"
     value = "string"
   },
-    {
-      name  = "STORAGE_CONTAINER_PRODUCT"
-      value = "selc-u-product"
-    },
-    {
+  {
+    name  = "STORAGE_CONTAINER_PRODUCT"
+    value = "selc-u-product"
+  },
+  {
     name  = "USER_MS_RETRY_MIN_BACKOFF"
     value = 5
-    },
-    {
+  },
+  {
     name  = "USER_MS_RETRY_MAX_BACKOFF"
     value = 60
-    },
-    {
+  },
+  {
     name  = "USER_MS_RETRY"
     value = 3
-    }
+  }
 ]
 
 secrets_names = {
diff --git a/infra/container_apps/user-ms/env/uat/terraform.tfvars b/infra/container_apps/user-ms/env/uat/terraform.tfvars
index 8e1d09ef..9241d09c 100644
--- a/infra/container_apps/user-ms/env/uat/terraform.tfvars
+++ b/infra/container_apps/user-ms/env/uat/terraform.tfvars
@@ -39,26 +39,26 @@ app_settings = [
     name  = "SHARED_ACCESS_KEY_NAME"
     value = "selfcare-wo"
   },
-    {
-      name  = "USER_MS_EVENTHUB_USERS_ENABLED"
-      value = true
-    },
-    {
-      name  = "STORAGE_CONTAINER_PRODUCT"
-      value = "selc-u-product"
-    },
-    {
+  {
+    name  = "USER_MS_EVENTHUB_USERS_ENABLED"
+    value = true
+  },
+  {
+    name  = "STORAGE_CONTAINER_PRODUCT"
+    value = "selc-u-product"
+  },
+  {
     name  = "USER_MS_RETRY_MIN_BACKOFF"
     value = 5
-    },
-    {
+  },
+  {
     name  = "USER_MS_RETRY_MAX_BACKOFF"
     value = 60
-    },
-    {
+  },
+  {
     name  = "USER_MS_RETRY"
     value = 3
-    }
+  }
 
 ]
 
diff --git a/infra/container_apps/user-ms/main.tf b/infra/container_apps/user-ms/main.tf
index d2b81b35..a68c583d 100644
--- a/infra/container_apps/user-ms/main.tf
+++ b/infra/container_apps/user-ms/main.tf
@@ -31,9 +31,9 @@ module "container_app_user_ms" {
         port   = 8080
         scheme = "HTTP"
       }
-      timeoutSeconds   = 5
-      type             = "Liveness"
-      failureThreshold = 3
+      timeoutSeconds      = 5
+      type                = "Liveness"
+      failureThreshold    = 3
       initialDelaySeconds = 1
     },
     {
@@ -42,9 +42,9 @@ module "container_app_user_ms" {
         port   = 8080
         scheme = "HTTP"
       }
-      timeoutSeconds   = 5
-      type             = "Readiness"
-      failureThreshold = 30
+      timeoutSeconds      = 5
+      type                = "Readiness"
+      failureThreshold    = 30
       initialDelaySeconds = 3
     },
     {
@@ -53,9 +53,9 @@ module "container_app_user_ms" {
         port   = 8080
         scheme = "HTTP"
       }
-      timeoutSeconds   = 5
-      failureThreshold = 5
-      type             = "Startup"
+      timeoutSeconds      = 5
+      failureThreshold    = 5
+      type                = "Startup"
       initialDelaySeconds = 5
     }
   ]
diff --git a/infra/container_apps/user-ms/mongo_db.tf b/infra/container_apps/user-ms/mongo_db.tf
index 5675cce0..1c5bab57 100644
--- a/infra/container_apps/user-ms/mongo_db.tf
+++ b/infra/container_apps/user-ms/mongo_db.tf
@@ -21,11 +21,11 @@ module "mongodb_collection_user_institutions" {
   cosmosdb_mongo_database_name = azurerm_cosmosdb_mongo_database.selc_user.name
 
   indexes = [{
-      keys   = ["_id"]
-      unique = true
+    keys   = ["_id"]
+    unique = true
     },
     {
-      keys   = ["userId","institutionId"]
+      keys   = ["userId", "institutionId"]
       unique = false
     }
   ]