diff --git a/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/infra/main.bicep b/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/infra/main.bicep
index 9ff77f88afa..3eb64886058 100644
--- a/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/infra/main.bicep
@@ -340,7 +340,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
     apiAppName: api.outputs.name
   }
diff --git a/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/infra/main.bicep b/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/infra/main.bicep
index 571af251b5a..a647be3f171 100644
--- a/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/infra/main.bicep
@@ -359,7 +359,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
     apiAppName: api.outputs.name
   }
diff --git a/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep b/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep
index 11ed1433574..e4ce65e99cf 100644
--- a/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep
@@ -342,7 +342,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
     apiAppName: api.outputs.name
   }
diff --git a/templates/todo/projects/java-mongo-aca/.repo/bicep/infra/main.bicep b/templates/todo/projects/java-mongo-aca/.repo/bicep/infra/main.bicep
index a0894ac6084..52c9ce32f57 100644
--- a/templates/todo/projects/java-mongo-aca/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/java-mongo-aca/.repo/bicep/infra/main.bicep
@@ -417,7 +417,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
   }
 }
diff --git a/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep b/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep
index a0778df106f..f0ff126481b 100644
--- a/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep
@@ -348,7 +348,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
     apiAppName: api.outputs.name
   }
diff --git a/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/infra/main.bicep b/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/infra/main.bicep
index a0894ac6084..52c9ce32f57 100644
--- a/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/infra/main.bicep
@@ -417,7 +417,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
   }
 }
diff --git a/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/infra/main.bicep b/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/infra/main.bicep
index 02fe6849bcf..c75d834ece6 100644
--- a/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/infra/main.bicep
@@ -82,14 +82,6 @@ var actualDatabaseName = !empty(cosmosDatabaseName) ? cosmosDatabaseName : defau
 var acrPullRole = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
 var aksClusterAdminRole = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b1ff04bb-8a4e-4dc4-8eb5-8693973ce19b')
 var systemPoolSpec = nodePoolPresets[systemPoolType]
-var nodePoolBase = {
-  osType: 'Linux'
-  maxPods: 30
-  type: 'VirtualMachineScaleSets'
-  upgradeSettings: {
-    maxSurge: '33%'
-  }
-}
 var nodePoolPresets = {
   CostOptimised: {
     vmSize: 'Standard_B4ms'
@@ -124,6 +116,14 @@ var nodePoolPresets = {
     ]
   }
 }
+var nodePoolBase = {
+  osType: 'Linux'
+  maxPods: 30
+  type: 'VirtualMachineScaleSets'
+  upgradeSettings: {
+    maxSurge: '33%'
+  }
+}
 
 // Organize resources in a resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
@@ -310,7 +310,7 @@ module logAnalytics 'br/public:avm/res/operational-insights/workspace:0.3.4' = {
 }
 
 // Monitor application with Azure applicationInsights
-module applicationInsights 'br/public:avm/res/insights/component:0.3.0' = {
+module applicationInsights 'br/public:avm/res/insights/component:0.3.1' = {
   name: 'applicationinsights'
   scope: rg
   params: {
diff --git a/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/infra/main.bicep b/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/infra/main.bicep
index 63e70b66beb..22ab294a987 100644
--- a/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/infra/main.bicep
@@ -358,7 +358,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
   }
 }
diff --git a/templates/todo/projects/nodejs-mongo/.repo/bicep/infra/main.bicep b/templates/todo/projects/nodejs-mongo/.repo/bicep/infra/main.bicep
index 8ef14f471e9..7d84e6cdaaf 100644
--- a/templates/todo/projects/nodejs-mongo/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/nodejs-mongo/.repo/bicep/infra/main.bicep
@@ -343,7 +343,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
     apiAppName: api.outputs.name
   }
diff --git a/templates/todo/projects/python-mongo-aca/.repo/bicep/infra/main.bicep b/templates/todo/projects/python-mongo-aca/.repo/bicep/infra/main.bicep
index 73255a9c388..5edd6a772b9 100644
--- a/templates/todo/projects/python-mongo-aca/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/python-mongo-aca/.repo/bicep/infra/main.bicep
@@ -423,7 +423,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
   }
 }
diff --git a/templates/todo/projects/python-mongo-swa-func/.repo/bicep/infra/main.bicep b/templates/todo/projects/python-mongo-swa-func/.repo/bicep/infra/main.bicep
index 52169bf6ce2..bd1261af453 100644
--- a/templates/todo/projects/python-mongo-swa-func/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/python-mongo-swa-func/.repo/bicep/infra/main.bicep
@@ -364,7 +364,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
   }
 }
diff --git a/templates/todo/projects/python-mongo/.repo/bicep/infra/main.bicep b/templates/todo/projects/python-mongo/.repo/bicep/infra/main.bicep
index e9f9d6deaed..0f2327f32aa 100644
--- a/templates/todo/projects/python-mongo/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/python-mongo/.repo/bicep/infra/main.bicep
@@ -349,7 +349,7 @@ module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' =
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: apim.outputs.resourceId
+    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
     apiName: apimApiName
     apiAppName: api.outputs.name
   }