diff --git a/infrastructure/infrastructure-setup-terraform/00-basic-azurerm/code/main.tf b/infrastructure/infrastructure-setup-terraform/00-basic-azurerm/code/main.tf
index e03f7c463..0c6c1498b 100644
--- a/infrastructure/infrastructure-setup-terraform/00-basic-azurerm/code/main.tf
+++ b/infrastructure/infrastructure-setup-terraform/00-basic-azurerm/code/main.tf
@@ -1,8 +1,8 @@
 ## Create a random string
 ## 
 resource "random_string" "unique" {
-  length      = 5
-  min_numeric = 5
+  length      = 8
+  min_numeric = 8
   numeric     = true
   special     = false
   lower       = true
diff --git a/infrastructure/infrastructure-setup-terraform/00-basic/code/main.tf b/infrastructure/infrastructure-setup-terraform/00-basic/code/main.tf
index 6bd6175ad..0e34d0dcf 100644
--- a/infrastructure/infrastructure-setup-terraform/00-basic/code/main.tf
+++ b/infrastructure/infrastructure-setup-terraform/00-basic/code/main.tf
@@ -1,8 +1,8 @@
 ## Create a random string
 ## 
 resource "random_string" "unique" {
-  length      = 5
-  min_numeric = 5
+  length      = 8
+  min_numeric = 8
   numeric     = true
   special     = false
   lower       = true
diff --git a/infrastructure/infrastructure-setup-terraform/15a-private-network-standard-agent-setup/code/main.tf b/infrastructure/infrastructure-setup-terraform/15a-private-network-standard-agent-setup/code/main.tf
index 50f45db9d..431f27f56 100644
--- a/infrastructure/infrastructure-setup-terraform/15a-private-network-standard-agent-setup/code/main.tf
+++ b/infrastructure/infrastructure-setup-terraform/15a-private-network-standard-agent-setup/code/main.tf
@@ -9,8 +9,8 @@ data "azurerm_client_config" "current" {}
 ## Create a random string
 ##
 resource "random_string" "unique" {
-  length      = 4
-  min_numeric = 4
+  length      = 8
+  min_numeric = 8
   numeric     = true
   special     = false
   lower       = true
@@ -148,7 +148,7 @@ resource "azapi_resource" "ai_search" {
       # Search-specific properties
       replicaCount   = 1
       partitionCount = 1
-      hostingMode    = "default"
+      hostingMode    = "Default"
       semanticSearch = "disabled"
 
       # Identity-related controls
diff --git a/infrastructure/infrastructure-setup-terraform/15b-private-network-standard-agent-setup-byovnet/code/main.tf b/infrastructure/infrastructure-setup-terraform/15b-private-network-standard-agent-setup-byovnet/code/main.tf
index e6b12f2fb..514c4f42c 100644
--- a/infrastructure/infrastructure-setup-terraform/15b-private-network-standard-agent-setup-byovnet/code/main.tf
+++ b/infrastructure/infrastructure-setup-terraform/15b-private-network-standard-agent-setup-byovnet/code/main.tf
@@ -4,8 +4,8 @@
 ## Create a random string
 ##
 resource "random_string" "unique" {
-  length      = 4
-  min_numeric = 4
+  length      = 8
+  min_numeric = 8
   numeric     = true
   special     = false
   lower       = true
@@ -102,7 +102,7 @@ resource "azapi_resource" "ai_search" {
       # Search-specific properties
       replicaCount   = 1
       partitionCount = 1
-      hostingMode    = "default"
+      hostingMode    = "Default"
       semanticSearch = "disabled"
 
       # Identity-related controls