diff --git a/src/terraform/examples/e2e/3.File.Storage/hammerspace.tf b/src/terraform/examples/e2e/3.File.Storage/hammerspace.tf
index bf19c3f8..6f7e7306 100644
--- a/src/terraform/examples/e2e/3.File.Storage/hammerspace.tf
+++ b/src/terraform/examples/e2e/3.File.Storage/hammerspace.tf
@@ -352,7 +352,7 @@ resource "azurerm_virtual_machine_extension" "storage" {
   type                       = "CustomScript"
   publisher                  = "Microsoft.Azure.Extensions"
   type_handler_version       = "2.1"
-  automatic_upgrade_enabled  = true
+  automatic_upgrade_enabled  = false
   auto_upgrade_minor_version = true
   virtual_machine_id         = "${azurerm_resource_group.hammerspace[0].id}/providers/Microsoft.Compute/virtualMachines/${each.value.name}"
   settings = jsonencode({
diff --git a/src/terraform/examples/e2e/3.File.Storage/weka.tf b/src/terraform/examples/e2e/3.File.Storage/weka.tf
index b67a8f09..300d6c4f 100644
--- a/src/terraform/examples/e2e/3.File.Storage/weka.tf
+++ b/src/terraform/examples/e2e/3.File.Storage/weka.tf
@@ -255,7 +255,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "weka" {
     type                       = "CustomScript"
     publisher                  = "Microsoft.Azure.Extensions"
     type_handler_version       = "2.1"
-    automatic_upgrade_enabled  = true
+    automatic_upgrade_enabled  = false
     auto_upgrade_minor_version = true
     settings = jsonencode({
       script = "${base64encode(
diff --git a/src/terraform/examples/e2e/4.File.Cache/config.auto.tfvars b/src/terraform/examples/e2e/4.File.Cache/config.auto.tfvars
index 5e49a3cc..17ac1be1 100644
--- a/src/terraform/examples/e2e/4.File.Cache/config.auto.tfvars
+++ b/src/terraform/examples/e2e/4.File.Cache/config.auto.tfvars
@@ -1,6 +1,6 @@
 resourceGroupName = "ArtistAnywhere.Cache" # Alphanumeric, underscores, hyphens, periods and parenthesis are allowed
 
-cacheName      = "cache" # Set to a uniquely identifiable cache cluster name
+cacheName      = "Cache" # Set to a uniquely identifiable cache cluster name
 enableHPCCache = true    # Enables HPC Cache (PaaS) instead of Avere vFXT (IaaS)
 enableDevMode  = false   # Enables non-production deployment of Avere vFXT (IaaS)
 
diff --git a/src/terraform/examples/e2e/4.File.Cache/hpc.tf b/src/terraform/examples/e2e/4.File.Cache/hpc.tf
index 855d2a89..be91f7fb 100644
--- a/src/terraform/examples/e2e/4.File.Cache/hpc.tf
+++ b/src/terraform/examples/e2e/4.File.Cache/hpc.tf
@@ -64,7 +64,7 @@ locals {
 
 resource "azurerm_role_assignment" "storage_account_contributor" {
   for_each = {
-    for storageTargetNfsBlob in local.storageTargetsNfsBlob : storageTargetNfsBlob.key => storageTargetNfsBlob
+    for storageTargetNfsBlob in var.storageTargetsNfsBlob: storageTargetNfsBlob.name => storageTargetNfsBlob
   }
   role_definition_name = "Storage Account Contributor" # https://learn.microsoft.com/azure/role-based-access-control/built-in-roles#storage-account-contributor
   principal_id         = data.azuread_service_principal.hpc_cache[0].object_id
@@ -73,7 +73,7 @@ resource "azurerm_role_assignment" "storage_account_contributor" {
 
 resource "azurerm_role_assignment" "storage_blob_data_contributor" {
   for_each = {
-    for storageTargetNfsBlob in local.storageTargetsNfsBlob : storageTargetNfsBlob.key => storageTargetNfsBlob
+    for storageTargetNfsBlob in var.storageTargetsNfsBlob: storageTargetNfsBlob.name => storageTargetNfsBlob
   }
   role_definition_name = "Storage Blob Data Contributor" # https://learn.microsoft.com/azure/role-based-access-control/built-in-roles#storage-blob-data-contributor
   principal_id         = data.azuread_service_principal.hpc_cache[0].object_id
diff --git a/src/terraform/examples/e2e/5.Render.Manager/vm.tf b/src/terraform/examples/e2e/5.Render.Manager/vm.tf
index 914c5494..733a00d4 100644
--- a/src/terraform/examples/e2e/5.Render.Manager/vm.tf
+++ b/src/terraform/examples/e2e/5.Render.Manager/vm.tf
@@ -155,7 +155,7 @@ resource "azurerm_virtual_machine_extension" "initialize_linux" {
   type                       = "CustomScript"
   publisher                  = "Microsoft.Azure.Extensions"
   type_handler_version       = "2.1"
-  automatic_upgrade_enabled  = true
+  automatic_upgrade_enabled  = false
   auto_upgrade_minor_version = true
   virtual_machine_id         = "${azurerm_resource_group.scheduler.id}/providers/Microsoft.Compute/virtualMachines/${each.value.name}"
   settings = jsonencode({
@@ -233,7 +233,7 @@ resource "azurerm_virtual_machine_extension" "initialize_windows" {
   type                       = "CustomScriptExtension"
   publisher                  = "Microsoft.Compute"
   type_handler_version       = "1.10"
-  automatic_upgrade_enabled  = true
+  automatic_upgrade_enabled  = false
   auto_upgrade_minor_version = true
   virtual_machine_id         = "${azurerm_resource_group.scheduler.id}/providers/Microsoft.Compute/virtualMachines/${each.value.name}"
   settings = jsonencode({
diff --git a/src/terraform/examples/e2e/6.Render.Farm/config.auto.tfvars b/src/terraform/examples/e2e/6.Render.Farm/config.auto.tfvars
index 537ff3cd..6e165e70 100644
--- a/src/terraform/examples/e2e/6.Render.Farm/config.auto.tfvars
+++ b/src/terraform/examples/e2e/6.Render.Farm/config.auto.tfvars
@@ -555,7 +555,8 @@ functionApp = {
 existingNetwork = {
   enable            = false
   name              = ""
-  subnetName        = ""
+  subnetNameFarm    = ""
+  subnetNameAI      = ""
   resourceGroupName = ""
 }
 
diff --git a/src/terraform/examples/e2e/6.Render.Farm/functions.tf b/src/terraform/examples/e2e/6.Render.Farm/functions.tf
index 13bb3dae..f2311c22 100644
--- a/src/terraform/examples/e2e/6.Render.Farm/functions.tf
+++ b/src/terraform/examples/e2e/6.Render.Farm/functions.tf
@@ -62,7 +62,7 @@ resource "azurerm_windows_function_app" "studio" {
   resource_group_name           = azurerm_resource_group.farm.name
   location                      = azurerm_resource_group.farm.location
   service_plan_id               = azurerm_service_plan.studio[0].id
-  virtual_network_subnet_id     = data.azurerm_subnet.farm.id
+  virtual_network_subnet_id     = data.azurerm_subnet.ai.id
   storage_account_name          = data.azurerm_storage_account.studio.name
   storage_uses_managed_identity = true
   public_network_access_enabled = false
diff --git a/src/terraform/examples/e2e/6.Render.Farm/main.tf b/src/terraform/examples/e2e/6.Render.Farm/main.tf
index bd568c5a..22120775 100644
--- a/src/terraform/examples/e2e/6.Render.Farm/main.tf
+++ b/src/terraform/examples/e2e/6.Render.Farm/main.tf
@@ -54,7 +54,8 @@ variable "existingNetwork" {
   type = object({
     enable            = bool
     name              = string
-    subnetName        = string
+    subnetNameFarm    = string
+    subnetNameAI      = string
     resourceGroupName = string
   })
 }
@@ -135,7 +136,13 @@ data "azurerm_virtual_network" "studio" {
 }
 
 data "azurerm_subnet" "farm" {
-  name                 = var.existingNetwork.enable ? var.existingNetwork.subnetName : data.terraform_remote_state.network.outputs.virtualNetwork.subnets[data.terraform_remote_state.network.outputs.virtualNetwork.subnetIndex.farm].name
+  name                 = var.existingNetwork.enable ? var.existingNetwork.subnetNameFarm : data.terraform_remote_state.network.outputs.virtualNetwork.subnets[data.terraform_remote_state.network.outputs.virtualNetwork.subnetIndex.farm].name
+  resource_group_name  = data.azurerm_virtual_network.studio.resource_group_name
+  virtual_network_name = data.azurerm_virtual_network.studio.name
+}
+
+data "azurerm_subnet" "ai" {
+  name                 = var.existingNetwork.enable ? var.existingNetwork.subnetNameAI : data.terraform_remote_state.network.outputs.virtualNetwork.subnets[data.terraform_remote_state.network.outputs.virtualNetwork.subnetIndex.ai].name
   resource_group_name  = data.azurerm_virtual_network.studio.resource_group_name
   virtual_network_name = data.azurerm_virtual_network.studio.name
 }
diff --git a/src/terraform/examples/e2e/6.Render.Farm/vmss.tf b/src/terraform/examples/e2e/6.Render.Farm/vmss.tf
index 5c25b999..aa432b6f 100644
--- a/src/terraform/examples/e2e/6.Render.Farm/vmss.tf
+++ b/src/terraform/examples/e2e/6.Render.Farm/vmss.tf
@@ -164,7 +164,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "farm" {
       type                       = "CustomScript"
       publisher                  = "Microsoft.Azure.Extensions"
       type_handler_version       = "2.1"
-      automatic_upgrade_enabled  = true
+      automatic_upgrade_enabled  = false
       auto_upgrade_minor_version = true
       settings = jsonencode({
         script = "${base64encode(
@@ -269,7 +269,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "farm" {
       type                       = "CustomScriptExtension"
       publisher                  = "Microsoft.Compute"
       type_handler_version       = "1.10"
-      automatic_upgrade_enabled  = true
+      automatic_upgrade_enabled  = false
       auto_upgrade_minor_version = true
       settings = jsonencode({
         commandToExecute = "PowerShell -ExecutionPolicy Unrestricted -EncodedCommand ${textencodebase64(
diff --git a/src/terraform/examples/e2e/7.Artist.Workstation/vm.tf b/src/terraform/examples/e2e/7.Artist.Workstation/vm.tf
index a52bd511..5903db52 100644
--- a/src/terraform/examples/e2e/7.Artist.Workstation/vm.tf
+++ b/src/terraform/examples/e2e/7.Artist.Workstation/vm.tf
@@ -149,7 +149,7 @@ resource "azurerm_virtual_machine_extension" "initialize_linux" {
   type                       = "CustomScript"
   publisher                  = "Microsoft.Azure.Extensions"
   type_handler_version       = "2.1"
-  automatic_upgrade_enabled  = true
+  automatic_upgrade_enabled  = false
   auto_upgrade_minor_version = true
   virtual_machine_id         = "${azurerm_resource_group.workstation.id}/providers/Microsoft.Compute/virtualMachines/${each.value.name}"
   settings = jsonencode({
@@ -225,7 +225,7 @@ resource "azurerm_virtual_machine_extension" "initialize_windows" {
   type                       = "CustomScriptExtension"
   publisher                  = "Microsoft.Compute"
   type_handler_version       = "1.10"
-  automatic_upgrade_enabled  = true
+  automatic_upgrade_enabled  = false
   auto_upgrade_minor_version = true
   virtual_machine_id         = "${azurerm_resource_group.workstation.id}/providers/Microsoft.Compute/virtualMachines/${each.value.name}"
   settings = jsonencode({