diff --git a/templates/todo/common/infra/bicep/app/apim-api-settings.bicep b/templates/todo/common/infra/bicep/app/apim-api-settings.bicep
index 76a7458bb85..3b3f342861c 100644
--- a/templates/todo/common/infra/bicep/app/apim-api-settings.bicep
+++ b/templates/todo/common/infra/bicep/app/apim-api-settings.bicep
@@ -8,6 +8,8 @@ param apiName string
 @description('Relative URL uniquely identifying this API and all of its resource paths within the API Management service instance. It is appended to the API endpoint base URL specified during the service instance creation to form a public URL for this API.')
 @minLength(1)
 param apiPath string
+
+@description('Resource name for the existing applicationInsights service')
 param applicationInsightsName string
 
 @description('Resource name for backend Web App or Function App')
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 36dfa57de4a..c2e2c275ea0 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
@@ -174,7 +174,7 @@ module appServicePlan 'br/public:avm/res/web/serverfarm:0.1.1' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 18f39477a0b..8c4a0ca0b5e 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
@@ -1,4 +1,3 @@
-
 targetScope = 'subscription'
 
 @minLength(1)
@@ -218,7 +217,7 @@ module storage 'br/public:avm/res/storage/storage-account:0.8.3' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 0455d390695..0790342f634 100644
--- a/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep
@@ -200,7 +200,7 @@ module appServicePlan 'br/public:avm/res/web/serverfarm:0.1.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.3.5' = {
   name: 'keyvault'
   scope: rg
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 fa101e59497..29b8d8c2016 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
@@ -261,7 +261,7 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.4.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 2ec6987a1e6..2a9244e5063 100644
--- a/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep
@@ -206,7 +206,7 @@ module appServicePlan 'br/public:avm/res/web/serverfarm:0.1.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.3.5' = {
   name: 'keyvault'
   scope: rg
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 fa101e59497..29b8d8c2016 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
@@ -261,7 +261,7 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.4.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 e1266f4be9b..595e13e2e53 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
@@ -271,7 +271,7 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.5.1' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.3.5' = {
   name: 'keyvault'
   scope: rg
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 12393511659..3b51ebff52b 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
@@ -216,7 +216,7 @@ module storage 'br/public:avm/res/storage/storage-account:0.8.3' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 925027914a3..bc6e76b0f15 100644
--- a/templates/todo/projects/nodejs-mongo/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/nodejs-mongo/.repo/bicep/infra/main.bicep
@@ -201,7 +201,7 @@ module appServicePlan 'br/public:avm/res/web/serverfarm:0.1.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.3.5' = {
   name: 'keyvault'
   scope: rg
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 fa101e59497..29b8d8c2016 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
@@ -261,7 +261,7 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.4.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 251701f9fec..bd6423f7b50 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
@@ -216,7 +216,7 @@ module storage 'br/public:avm/res/storage/storage-account:0.8.3' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   name: 'keyvault'
   scope: rg
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 dd8109d1eb8..0bc3da3a61f 100644
--- a/templates/todo/projects/python-mongo/.repo/bicep/infra/main.bicep
+++ b/templates/todo/projects/python-mongo/.repo/bicep/infra/main.bicep
@@ -201,7 +201,7 @@ module appServicePlan 'br/public:avm/res/web/serverfarm:0.1.0' = {
   }
 }
 
-// Store secrets in a keyvault
+// Create a keyvault to store secrets
 module keyVault 'br/public:avm/res/key-vault/vault:0.3.5' = {
   name: 'keyvault'
   scope: rg