diff --git a/infra/main.bicep b/infra/main.bicep
index e312d9e..dbfda3b 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -286,6 +286,7 @@ module cognitiveServices 'modules/cognitive-services/cognitiveServices.bicep' =
     networkAcls: networkAcls
     virtualNetworkResourceId: networkIsolation ? network.outputs.resourceId : ''
     virtualNetworkSubnetResourceId: networkIsolation ? network.outputs.defaultSubnetResourceId : ''
+    virtualNetworkLocation: location
     principalIds: deploySampleApp ? [appIdentity.outputs.principalId] : []
     logAnalyticsWorkspaceResourceId: logAnalyticsWorkspaceResourceId
     aiModelDeployments: [
diff --git a/infra/main.json b/infra/main.json
index 718cd1f..55453ab 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.36.1.42791",
-      "templateHash": "1373380208520748300"
+      "version": "0.39.26.7824",
+      "templateHash": "7988785990414942308"
     }
   },
   "definitions": {
@@ -902,7 +902,7 @@
     },
     "deployerPrincipalType": {
       "type": "string",
-      "defaultValue": "User",
+      "defaultValue": "[if(contains(deployer(), 'userPrincipalName'), 'User', 'ServicePrincipal')]",
       "metadata": {
         "description": "The type of principal that is deploying the resources. Use \"User\" for interactive deployment and \"ServicePrincipal\" for automated deployment."
       }
@@ -1083,7 +1083,7 @@
     "appIdentity": {
       "condition": "[variables('deploySampleApp')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-identity-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -1563,7 +1563,7 @@
     "logAnalyticsWorkspace": {
       "condition": "[not(variables('useExistingLogAnalytics'))]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-log-analytics-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -4587,7 +4587,7 @@
     },
     "applicationInsights": {
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-app-insights-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -5302,7 +5302,7 @@
     "network": {
       "condition": "[parameters('networkIsolation')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-network-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -5330,8 +5330,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "14803697760422194567"
+              "version": "0.39.26.7824",
+              "templateHash": "6948404664303314912"
             }
           },
           "parameters": {
@@ -5376,7 +5376,7 @@
           "resources": [
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-bastion-nsg', parameters('resourceToken')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -6175,7 +6175,7 @@
             },
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-default-nsg', parameters('resourceToken')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -6831,7 +6831,7 @@
             },
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-app-nsg', parameters('resourceToken')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -7487,7 +7487,7 @@
             },
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-vnet', parameters('resourceToken')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -7530,17 +7530,17 @@
                         "addressPrefix": "10.3.1.0/24",
                         "privateEndpointNetworkPolicies": "Disabled",
                         "privateLinkServiceNetworkPolicies": "Disabled",
-                        "networkSecurityGroupResourceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-default-nsg', parameters('resourceToken')), 64)), '2022-09-01').outputs.resourceId.value]"
+                        "networkSecurityGroupResourceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-default-nsg', parameters('resourceToken')), 64)), '2025-04-01').outputs.resourceId.value]"
                       },
                       {
                         "name": "[variables('bastionSubnetName')]",
                         "addressPrefix": "10.3.2.0/24",
-                        "networkSecurityGroupResourceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-bastion-nsg', parameters('resourceToken')), 64)), '2022-09-01').outputs.resourceId.value]"
+                        "networkSecurityGroupResourceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-bastion-nsg', parameters('resourceToken')), 64)), '2025-04-01').outputs.resourceId.value]"
                       },
                       {
                         "name": "[variables('appSubnetName')]",
                         "addressPrefix": "10.3.3.0/24",
-                        "networkSecurityGroupResourceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-app-nsg', parameters('resourceToken')), 64)), '2022-09-01').outputs.resourceId.value]",
+                        "networkSecurityGroupResourceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-app-nsg', parameters('resourceToken')), 64)), '2025-04-01').outputs.resourceId.value]",
                         "delegation": "Microsoft.Web/serverfarms"
                       }
                     ]
@@ -9176,7 +9176,7 @@
             },
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-bastion', parameters('resourceToken')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -9194,7 +9194,7 @@
                     "value": "Standard"
                   },
                   "virtualNetworkResourceId": {
-                    "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.resourceId.value]"
+                    "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.resourceId.value]"
                   },
                   "diagnosticSettings": {
                     "value": [
@@ -10504,39 +10504,39 @@
           "outputs": {
             "resourceId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.resourceId.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.resourceId.value]"
             },
             "name": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.name.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.name.value]"
             },
             "bastionName": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-bastion', parameters('resourceToken')), 64)), '2022-09-01').outputs.name.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-bastion', parameters('resourceToken')), 64)), '2025-04-01').outputs.name.value]"
             },
             "defaultSubnetName": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.subnetNames.value[0]]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.subnetNames.value[0]]"
             },
             "defaultSubnetResourceId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.subnetResourceIds.value[0]]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.subnetResourceIds.value[0]]"
             },
             "bastionSubnetName": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.subnetNames.value[1]]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.subnetNames.value[1]]"
             },
             "bastionSubnetResourceId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.subnetResourceIds.value[1]]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.subnetResourceIds.value[1]]"
             },
             "appSubnetName": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.subnetNames.value[2]]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.subnetNames.value[2]]"
             },
             "appSubnetResourceId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2022-09-01').outputs.subnetResourceIds.value[2]]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-vnet', parameters('resourceToken')), 64)), '2025-04-01').outputs.subnetResourceIds.value[2]]"
             }
           }
         }
@@ -10547,7 +10547,7 @@
     },
     "keyvault": {
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-keyvault-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -10582,8 +10582,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "8370014477286310434"
+              "version": "0.39.26.7824",
+              "templateHash": "10895245497281040611"
             }
           },
           "definitions": {
@@ -10888,7 +10888,7 @@
             "privateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-keyvault-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -13930,7 +13930,7 @@
             },
             "keyvault": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-keyvault-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -17132,7 +17132,7 @@
     "containerRegistry": {
       "condition": "[parameters('acrEnabled')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-container-registry-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -17162,8 +17162,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "2158520837294746606"
+              "version": "0.39.26.7824",
+              "templateHash": "772877387007074953"
             }
           },
           "parameters": {
@@ -17220,7 +17220,7 @@
             {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-acr-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -20262,7 +20262,7 @@
             },
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -20312,7 +20312,7 @@
                       }
                     ]
                   },
-                  "privateEndpoints": "[if(parameters('networkIsolation'), createObject('value', createArray(createObject('privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('privateDnsZoneResourceId', reference(resourceId('Microsoft.Resources/deployments', 'private-dns-acr-deployment'), '2022-09-01').outputs.resourceId.value))), 'subnetResourceId', parameters('virtualNetworkSubnetResourceId')))), createObject('value', createArray()))]"
+                  "privateEndpoints": "[if(parameters('networkIsolation'), createObject('value', createArray(createObject('privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('privateDnsZoneResourceId', reference(resourceId('Microsoft.Resources/deployments', 'private-dns-acr-deployment'), '2025-04-01').outputs.resourceId.value))), 'subnetResourceId', parameters('virtualNetworkSubnetResourceId')))), createObject('value', createArray()))]"
                 },
                 "template": {
                   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -23334,15 +23334,15 @@
           "outputs": {
             "resourceId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)), '2022-09-01').outputs.resourceId.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)), '2025-04-01').outputs.resourceId.value]"
             },
             "loginServer": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)), '2022-09-01').outputs.loginServer.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)), '2025-04-01').outputs.loginServer.value]"
             },
             "name": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)), '2022-09-01').outputs.name.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-container-registry-deployment', variables('nameFormatted')), 64)), '2025-04-01').outputs.name.value]"
             }
           }
         }
@@ -23354,7 +23354,7 @@
     },
     "storageAccount": {
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-storage-account-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -23388,8 +23388,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "17337127158083160925"
+              "version": "0.39.26.7824",
+              "templateHash": "11860570090394418313"
             }
           },
           "definitions": {
@@ -23532,7 +23532,7 @@
             "blobPrivateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-blob-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -26575,7 +26575,7 @@
             "filePrivateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-file-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -29617,7 +29617,7 @@
             },
             "storageAccount": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-storage-account-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -35354,7 +35354,7 @@
     },
     "cognitiveServices": {
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[format('{0}-cognitive-services-deployment', parameters('name'))]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -35379,6 +35379,9 @@
           },
           "virtualNetworkResourceId": "[if(parameters('networkIsolation'), createObject('value', reference('network').outputs.resourceId.value), createObject('value', ''))]",
           "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', reference('network').outputs.defaultSubnetResourceId.value), createObject('value', ''))]",
+          "virtualNetworkLocation": {
+            "value": "[parameters('location')]"
+          },
           "principalIds": "[if(variables('deploySampleApp'), createObject('value', createArray(reference('appIdentity').outputs.principalId.value)), createObject('value', createArray()))]",
           "logAnalyticsWorkspaceResourceId": "[if(variables('useExistingLogAnalytics'), createObject('value', extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName'))), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value))]",
           "aiModelDeployments": {
@@ -35425,8 +35428,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "14315395244831965269"
+              "version": "0.39.26.7824",
+              "templateHash": "2044447907186201225"
             }
           },
           "definitions": {
@@ -35600,6 +35603,12 @@
                 "description": "Resource ID of the subnet for the private endpoint."
               }
             },
+            "virtualNetworkLocation": {
+              "type": "string",
+              "metadata": {
+                "description": "Virtual Network Location."
+              }
+            },
             "logAnalyticsWorkspaceResourceId": {
               "type": "string",
               "metadata": {
@@ -35677,7 +35686,7 @@
             "cognitiveServicesPrivateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-cognitiveservices-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -38720,7 +38729,7 @@
             "openAiPrivateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-openai-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -41762,7 +41771,7 @@
             },
             "aiServices": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-ai-services-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -41789,6 +41798,9 @@
                     "value": "[parameters('networkAcls')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value, reference('openAiPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -41810,8 +41822,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -42084,6 +42096,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -42139,7 +42157,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -44468,7 +44486,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -44480,7 +44498,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -45270,7 +45288,7 @@
             "contentSafety": {
               "condition": "[parameters('contentSafetyEnabled')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-content-safety-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -45294,6 +45312,9 @@
                     "value": "[parameters('networkAcls')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -45312,8 +45333,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -45586,6 +45607,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -45641,7 +45668,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -47970,7 +47997,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -47982,7 +48009,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -48771,7 +48798,7 @@
             "vision": {
               "condition": "[parameters('visionEnabled')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-vision-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -48798,6 +48825,9 @@
                     "value": "[parameters('networkAcls')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -48816,8 +48846,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -49090,6 +49120,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -49145,7 +49181,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -51474,7 +51510,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -51486,7 +51522,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -52275,7 +52311,7 @@
             "language": {
               "condition": "[parameters('languageEnabled')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-language-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -52302,6 +52338,9 @@
                     "value": "[parameters('networkAcls')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -52320,8 +52359,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -52594,6 +52633,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -52649,7 +52694,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -54978,7 +55023,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -54990,7 +55035,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -55779,7 +55824,7 @@
             "speech": {
               "condition": "[parameters('speechEnabled')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-speech-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -55803,6 +55848,9 @@
                     "value": "[parameters('networkAcls')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -55821,8 +55869,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -56095,6 +56143,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -56150,7 +56204,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -58479,7 +58533,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -58491,7 +58545,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -59280,7 +59334,7 @@
             "translator": {
               "condition": "[parameters('translatorEnabled')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-translator-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -59307,6 +59361,9 @@
                     "value": "[parameters('networkAcls')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -59325,8 +59382,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -59599,6 +59656,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -59654,7 +59717,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -61983,7 +62046,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -61995,7 +62058,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -62784,7 +62847,7 @@
             "documentIntelligence": {
               "condition": "[parameters('documentIntelligenceEnabled')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-doc-intel-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -62805,6 +62868,9 @@
                     "value": "[parameters('networkIsolation')]"
                   },
                   "virtualNetworkSubnetResourceId": "[if(parameters('networkIsolation'), createObject('value', parameters('virtualNetworkSubnetResourceId')), createObject('value', ''))]",
+                  "virtualNetworkLocation": {
+                    "value": "[parameters('virtualNetworkLocation')]"
+                  },
                   "privateDnsZonesResourceIds": "[if(parameters('networkIsolation'), createObject('value', createArray(reference('cognitiveServicesPrivateDnsZone').outputs.resourceId.value)), createObject('value', createArray()))]",
                   "logAnalyticsWorkspaceResourceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
@@ -62826,8 +62892,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.36.1.42791",
-                      "templateHash": "10311336156988629056"
+                      "version": "0.39.26.7824",
+                      "templateHash": "6217039063190933381"
                     }
                   },
                   "definitions": {
@@ -63100,6 +63166,12 @@
                         "description": "Resource ID of the subnet for the private endpoint."
                       }
                     },
+                    "virtualNetworkLocation": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Virtual Network Location."
+                      }
+                    },
                     "logAnalyticsWorkspaceResourceId": {
                       "type": "string",
                       "metadata": {
@@ -63155,7 +63227,7 @@
                   "resources": {
                     "cognitiveService": {
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('cog-{0}-{1}-deployment', parameters('kind'), parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -65484,7 +65556,7 @@
                     "cognitiveServicePrivateEndpoint": {
                       "condition": "[parameters('networkIsolation')]",
                       "type": "Microsoft.Resources/deployments",
-                      "apiVersion": "2022-09-01",
+                      "apiVersion": "2025-04-01",
                       "name": "[take(format('pep-{0}-deployment', parameters('name')), 64)]",
                       "properties": {
                         "expressionEvaluationOptions": {
@@ -65496,7 +65568,7 @@
                             "value": "[format('pep-{0}-cognitiveservices', variables('nameFormatted'))]"
                           },
                           "location": {
-                            "value": "[parameters('location')]"
+                            "value": "[parameters('virtualNetworkLocation')]"
                           },
                           "tags": {
                             "value": "[parameters('tags')]"
@@ -66315,7 +66387,7 @@
     },
     "project": {
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[format('{0}prj', parameters('name'))]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -66350,8 +66422,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "15578119539506362308"
+              "version": "0.39.26.7824",
+              "templateHash": "3810756871922646205"
             }
           },
           "parameters": {
@@ -66517,7 +66589,7 @@
     "aiSearch": {
       "condition": "[parameters('searchEnabled')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-ai-search-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -66551,8 +66623,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "12098504235093504002"
+              "version": "0.39.26.7824",
+              "templateHash": "15399943804355664424"
             }
           },
           "definitions": {
@@ -66695,7 +66767,7 @@
             "privateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-search-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -69737,7 +69809,7 @@
             },
             "aiSearch": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-search-services-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -71888,7 +71960,7 @@
     "virtualMachine": {
       "condition": "[parameters('networkIsolation')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-virtual-machine-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -71971,8 +72043,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "4468531073363994392"
+              "version": "0.39.26.7824",
+              "templateHash": "9970690369855047523"
             }
           },
           "parameters": {
@@ -72512,7 +72584,7 @@
     "apim": {
       "condition": "[parameters('apiManagementEnabled')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-apim-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -72551,8 +72623,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "9207373860269569676"
+              "version": "0.39.26.7824",
+              "templateHash": "14004504203094820020"
             }
           },
           "parameters": {
@@ -72630,7 +72702,7 @@
           "resources": [
             {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-apim-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -76636,7 +76708,7 @@
             {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-apim-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -79679,7 +79751,7 @@
             {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-apim-private-endpoint-deployment', parameters('name')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -79688,7 +79760,7 @@
                 "mode": "Incremental",
                 "parameters": {
                   "name": {
-                    "value": "[toLower(format('pep-{0}', reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2022-09-01').outputs.name.value))]"
+                    "value": "[toLower(format('pep-{0}', reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2025-04-01').outputs.name.value))]"
                   },
                   "subnetResourceId": {
                     "value": "[parameters('virtualNetworkSubnetResourceId')]"
@@ -79697,7 +79769,7 @@
                     "value": {
                       "privateDnsZoneGroupConfigs": [
                         {
-                          "privateDnsZoneResourceId": "[reference(resourceId('Microsoft.Resources/deployments', 'private-dns-apim-deployment'), '2022-09-01').outputs.resourceId.value]"
+                          "privateDnsZoneResourceId": "[reference(resourceId('Microsoft.Resources/deployments', 'private-dns-apim-deployment'), '2025-04-01').outputs.resourceId.value]"
                         }
                       ]
                     }
@@ -79705,12 +79777,12 @@
                   "privateLinkServiceConnections": {
                     "value": [
                       {
-                        "name": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2022-09-01').outputs.name.value]",
+                        "name": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2025-04-01').outputs.name.value]",
                         "properties": {
                           "groupIds": [
                             "Gateway"
                           ],
-                          "privateLinkServiceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2022-09-01').outputs.resourceId.value]"
+                          "privateLinkServiceId": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2025-04-01').outputs.resourceId.value]"
                         }
                       }
                     ]
@@ -80423,19 +80495,19 @@
           "outputs": {
             "resourceId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2022-09-01').outputs.resourceId.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2025-04-01').outputs.resourceId.value]"
             },
             "name": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2022-09-01').outputs.name.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-deployment', parameters('name')), 64)), '2025-04-01').outputs.name.value]"
             },
             "privateEndpointId": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-private-endpoint-deployment', parameters('name')), 64)), '2022-09-01').outputs.resourceId.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-private-endpoint-deployment', parameters('name')), 64)), '2025-04-01').outputs.resourceId.value]"
             },
             "privateEndpointName": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-private-endpoint-deployment', parameters('name')), 64)), '2022-09-01').outputs.name.value]"
+              "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-apim-private-endpoint-deployment', parameters('name')), 64)), '2025-04-01').outputs.name.value]"
             }
           }
         }
@@ -80448,7 +80520,7 @@
     "cosmosDb": {
       "condition": "[parameters('cosmosDbEnabled')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-cosmosdb-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -80483,8 +80555,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "15027270706090004733"
+              "version": "0.39.26.7824",
+              "templateHash": "15725317833989257826"
             }
           },
           "definitions": {
@@ -80820,7 +80892,7 @@
             "privateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-cosmosdb-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -83862,7 +83934,7 @@
             },
             "cosmosDb": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-cosmosdb-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -87701,11 +87773,11 @@
           "outputs": {
             "resourceId": {
               "type": "string",
-              "value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', take(format('{0}-cosmosdb-deployment', variables('nameFormatted')), 64)), '2022-09-01').resourceId]"
+              "value": "[reference('cosmosDb').outputs.resourceId.value]"
             },
             "cosmosDBname": {
               "type": "string",
-              "value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', take(format('{0}-cosmosdb-deployment', variables('nameFormatted')), 64)), '2022-09-01').name]"
+              "value": "[reference('cosmosDb').outputs.name.value]"
             }
           }
         }
@@ -87719,7 +87791,7 @@
     "sqlServer": {
       "condition": "[parameters('sqlServerEnabled')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-sqlserver-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -87758,8 +87830,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "18362011243916437863"
+              "version": "0.39.26.7824",
+              "templateHash": "7652322861657523529"
             }
           },
           "definitions": {
@@ -88499,7 +88571,7 @@
             "privateDnsZone": {
               "condition": "[parameters('networkIsolation')]",
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "private-dns-sql-deployment",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -91541,7 +91613,7 @@
             },
             "sqlServer": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-sqlserver-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -97787,7 +97859,7 @@
     "appService": {
       "condition": "[variables('deploySampleApp')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "[take(format('{0}-app-service-deployment', parameters('name')), 64)]",
       "properties": {
         "expressionEvaluationOptions": {
@@ -97861,8 +97933,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "16909276659049541183"
+              "version": "0.39.26.7824",
+              "templateHash": "18326459588011694066"
             }
           },
           "definitions": {
@@ -98123,7 +98195,7 @@
             },
             "appServicePlan": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-app-service-plan-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -98699,7 +98771,7 @@
             },
             "appService": {
               "type": "Microsoft.Resources/deployments",
-              "apiVersion": "2022-09-01",
+              "apiVersion": "2025-04-01",
               "name": "[take(format('{0}-app-service-deployment', variables('nameFormatted')), 64)]",
               "properties": {
                 "expressionEvaluationOptions": {
@@ -104362,7 +104434,7 @@
     "appSample": {
       "condition": "[variables('deploySampleApp')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2022-09-01",
+      "apiVersion": "2025-04-01",
       "name": "app-sample-deployment",
       "properties": {
         "expressionEvaluationOptions": {
@@ -104390,8 +104462,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.36.1.42791",
-              "templateHash": "5085333471373527815"
+              "version": "0.39.26.7824",
+              "templateHash": "13410999373003815054"
             }
           },
           "definitions": {
@@ -104674,6 +104746,10 @@
     "AZURE_APP_SAMPLE_ENABLED": {
       "type": "bool",
       "value": "[variables('deploySampleApp')]"
+    },
+    "AZURE_AI_AGENT_ENDPOINT": {
+      "type": "string",
+      "value": "[reference('cognitiveServices').outputs.aiServicesEndpoint.value]"
     }
   }
 }
\ No newline at end of file
diff --git a/infra/modules/cognitive-services/cognitiveServices.bicep b/infra/modules/cognitive-services/cognitiveServices.bicep
index 765d721..9226368 100644
--- a/infra/modules/cognitive-services/cognitiveServices.bicep
+++ b/infra/modules/cognitive-services/cognitiveServices.bicep
@@ -30,6 +30,9 @@ param virtualNetworkResourceId string
 @description('Resource ID of the subnet for the private endpoint.')
 param virtualNetworkSubnetResourceId string
 
+@description('Virtual Network Location.')
+param virtualNetworkLocation string
+
 @description('Resource ID of the Log Analytics workspace to use for diagnostic settings.')
 param logAnalyticsWorkspaceResourceId string
 
@@ -121,6 +124,7 @@ module aiServices 'service.bicep' = {
     networkIsolation: networkIsolation
     networkAcls: networkAcls
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
       openAiPrivateDnsZone.outputs.resourceId
@@ -144,6 +148,7 @@ module contentSafety 'service.bicep' = if (contentSafetyEnabled) {
     networkIsolation: networkIsolation
     networkAcls: networkAcls
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
     ]: []
@@ -165,6 +170,7 @@ module vision 'service.bicep' = if (visionEnabled) {
     networkIsolation: networkIsolation
     networkAcls: networkAcls
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
     ] : []
@@ -186,6 +192,7 @@ module language 'service.bicep' = if (languageEnabled) {
     networkIsolation: networkIsolation
     networkAcls: networkAcls
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
     ] : []
@@ -206,6 +213,7 @@ module speech 'service.bicep' = if (speechEnabled) {
     networkIsolation: networkIsolation
     networkAcls: networkAcls
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
     ] : []
@@ -227,6 +235,7 @@ module translator 'service.bicep' = if (translatorEnabled) {
     networkIsolation: networkIsolation
     networkAcls: networkAcls
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
     ] : []
@@ -246,6 +255,7 @@ module documentIntelligence 'service.bicep' = if (documentIntelligenceEnabled) {
     kind: 'FormRecognizer'
     networkIsolation: networkIsolation
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
+    virtualNetworkLocation: virtualNetworkLocation
     privateDnsZonesResourceIds: networkIsolation ? [ 
       cognitiveServicesPrivateDnsZone.outputs.resourceId
     ] : []
diff --git a/infra/modules/cognitive-services/service.bicep b/infra/modules/cognitive-services/service.bicep
index 828408b..a3cdedd 100644
--- a/infra/modules/cognitive-services/service.bicep
+++ b/infra/modules/cognitive-services/service.bicep
@@ -60,6 +60,9 @@ param privateDnsZonesResourceIds string[] = []
 @description('Resource ID of the subnet for the private endpoint.')
 param virtualNetworkSubnetResourceId string
 
+@description('Virtual Network Location.')
+param virtualNetworkLocation string
+
 @description('The resource ID of the Log Analytics workspace to use for diagnostic settings.')
 param logAnalyticsWorkspaceResourceId string
 
@@ -114,7 +117,7 @@ module cognitiveServicePrivateEndpoint 'br/public:avm/res/network/private-endpoi
   name: take('pep-${name}-deployment', 64)
   params: {
     name: 'pep-${nameFormatted}-cognitiveservices'
-    location: location
+    location: virtualNetworkLocation
     tags: tags
     privateLinkServiceConnections: [
       {