diff --git a/infra/main.bicep b/infra/main.bicep
index 6873190d..1bd6aa9f 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -487,7 +487,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
 }
 
 // // ========== AI Foundry and related resources ========== //
-module avmAiServices 'modules/account/main.bicep' = {
+module avmAiServices 'modules/account/aifoundry.bicep' = {
   name: take('module.ai-services.${solutionSuffix}', 64)
   params: {
     name: 'aif-${solutionSuffix}'
diff --git a/infra/main.json b/infra/main.json
index fb5a9690..5a2c14aa 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.37.4.10188",
-      "templateHash": "14259315155038248870"
+      "templateHash": "6682056177373814634"
     },
     "name": "Content Processing Solution Accelerator",
     "description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -20454,7 +20454,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.37.4.10188",
-              "templateHash": "16080670397776921948"
+              "templateHash": "251116960322750261"
             },
             "name": "Key Vault Module"
           },
@@ -20625,13 +20625,7 @@
                   "enableTelemetry": {
                     "value": "[parameters('enableTelemetry')]"
                   },
-                  "diagnosticSettings": {
-                    "value": [
-                      {
-                        "workspaceResourceId": "[parameters('logAnalyticsWorkspaceResourceId')]"
-                      }
-                    ]
-                  },
+                  "diagnosticSettings": "[if(empty(parameters('logAnalyticsWorkspaceResourceId')), createObject('value', null()), createObject('value', createArray(createObject('workspaceResourceId', parameters('logAnalyticsWorkspaceResourceId')))))]",
                   "networkAcls": {
                     "value": "[parameters('networkAcls')]"
                   }
@@ -38709,10 +38703,10 @@
       "dependsOn": [
         "avmContainerApp",
         "avmManagedIdentity",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "logAnalyticsWorkspace",
         "virtualNetwork"
       ]