diff --git a/azure.yaml b/azure.yaml
index 602b3c6f..705bc041 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -24,3 +24,20 @@ deployment:
     solutionPrefix: ${parameters.solutionPrefix}
     otherLocation: ${parameters.otherLocation}
     baseUrl: ${parameters.baseUrl}
+
+hooks:
+  postprovision:
+    windows:
+      run: |
+        Write-Host "Web app URL: "
+        Write-Host "$env:WEB_APP_URL" -ForegroundColor Cyan
+      shell: pwsh
+      continueOnError: false
+      interactive: true
+    posix:
+      run: |
+        echo "Web app URL: "
+        echo $WEB_APP_URL
+      shell: sh
+      continueOnError: false
+      interactive: true
\ No newline at end of file
diff --git a/infra/deploy_ai_foundry.bicep b/infra/deploy_ai_foundry.bicep
index 6a56fd5a..a5ec9e55 100644
--- a/infra/deploy_ai_foundry.bicep
+++ b/infra/deploy_ai_foundry.bicep
@@ -10,22 +10,22 @@ param embeddingModel string
 param embeddingDeploymentCapacity int
 param managedIdentityObjectId string
 
-var storageName = '${solutionName}hubstorage'
+var storageName = 'st${solutionName}hub'
 var storageSkuName = 'Standard_LRS'
-var aiServicesName = '${solutionName}-aiservices'
+var aiServicesName = 'ais-${solutionName}'
 // var aiServicesName_m = '${solutionName}-aiservices_m'
 // var location_m = solutionLocation
-var applicationInsightsName = '${solutionName}-appinsights'
-var containerRegistryName = '${solutionName}acr'
-var keyvaultName = '${solutionName}-kv'
+var applicationInsightsName = 'appi-${solutionName}'
+var containerRegistryName = 'cr-${solutionName}'
+var keyvaultName = 'kv-${solutionName}'
 var location = solutionLocation //'eastus2'
-var aiHubName = '${solutionName}-aihub'
+var aiHubName = 'hub-${solutionName}'
 var aiHubFriendlyName = aiHubName
 var aiHubDescription = 'AI Hub'
-var aiProjectName = '${solutionName}-aiproject'
+var aiProjectName = 'proj-${solutionName}'
 var aiProjectFriendlyName = aiProjectName
-var aiSearchName = '${solutionName}-search'
-var workspaceName = '${solutionName}-workspace'
+var aiSearchName = 'srch-${solutionName}'
+var workspaceName = 'log-${solutionName}-hub'
 var aiModelDeployments = [
   {
     name: gptModelName
diff --git a/infra/deploy_app_service.bicep b/infra/deploy_app_service.bicep
index 1d3ddc0b..b92377b1 100644
--- a/infra/deploy_app_service.bicep
+++ b/infra/deploy_app_service.bicep
@@ -12,7 +12,7 @@ param solutionName string
 // param identity string
 
 @description('Name of App Service plan')
-param HostingPlanName string = '${ solutionName }-app-service-plan'
+param HostingPlanName string = 'asp-${ solutionName }'
 
 @description('The pricing tier for the App Service plan')
 @allowed(
@@ -20,10 +20,10 @@ param HostingPlanName string = '${ solutionName }-app-service-plan'
 )
 // param HostingPlanSku string = 'B1'
 
-param HostingPlanSku string = 'P0v3'
+param HostingPlanSku string = 'B1'
 
 @description('Name of Web App')
-param WebsiteName string = '${ solutionName }-app-service'
+param WebsiteName string = 'app-${ solutionName }'
 
 // @description('Name of Application Insights')
 // param ApplicationInsightsName string = '${ solutionName }-app-insights'
diff --git a/infra/deploy_cosmos_db.bicep b/infra/deploy_cosmos_db.bicep
index f488f202..1d87fcb6 100644
--- a/infra/deploy_cosmos_db.bicep
+++ b/infra/deploy_cosmos_db.bicep
@@ -5,7 +5,7 @@ param solutionName string
 param solutionLocation string
 param keyVaultName string
 
-var accountName = '${ solutionName }-cosmos'
+var accountName = 'cosmos-${ solutionName }'
 var databaseName = 'db_conversation_history'
 var collectionName = 'conversations'
 
diff --git a/infra/deploy_keyvault.bicep b/infra/deploy_keyvault.bicep
index e72d0355..c30c6312 100644
--- a/infra/deploy_keyvault.bicep
+++ b/infra/deploy_keyvault.bicep
@@ -5,7 +5,7 @@ param solutionName string
 param solutionLocation string
 param managedIdentityObjectId string
 
-var keyvaultName = '${solutionName}-kv'
+var keyvaultName = 'kv-${solutionName}'
 
 resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
   name: keyvaultName
diff --git a/infra/deploy_managed_identity.bicep b/infra/deploy_managed_identity.bicep
index d69cbf66..3452330b 100644
--- a/infra/deploy_managed_identity.bicep
+++ b/infra/deploy_managed_identity.bicep
@@ -10,7 +10,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-param miName string = '${ solutionName }-managed-identity'
+param miName string = 'id-${ solutionName }'
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: miName
diff --git a/infra/deploy_post_deployment_scripts.bicep b/infra/deploy_post_deployment_scripts.bicep
index 0959708b..b535fdbd 100644
--- a/infra/deploy_post_deployment_scripts.bicep
+++ b/infra/deploy_post_deployment_scripts.bicep
@@ -7,8 +7,8 @@ param managedIdentityObjectId string
 param managedIdentityClientId string
 param storageAccountName string
 param containerName string
-param containerAppName string = '${ solutionName }containerapp'
-param environmentName string = '${ solutionName }containerappenv'
+param containerAppName string = 'ca-${ solutionName }'
+param environmentName string = 'cae-${ solutionName }'
 param imageName string = 'python:3.11-alpine'
 param setupCopyKbFiles string = '${baseUrl}infra/scripts/copy_kb_files.sh'
 param setupCreateIndexScriptsUrl string = '${baseUrl}infra/scripts/run_create_index_scripts.sh'
diff --git a/infra/deploy_storage_account.bicep b/infra/deploy_storage_account.bicep
index 4ca297dc..2db349c2 100644
--- a/infra/deploy_storage_account.bicep
+++ b/infra/deploy_storage_account.bicep
@@ -10,7 +10,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-param saName string = '${ solutionName }storage'
+param saName string = 'st${ solutionName }'
 
 param keyVaultName string
 param managedIdentityObjectId string
diff --git a/infra/main.bicep b/infra/main.bicep
index accfc657..aa34e4a5 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -62,8 +62,8 @@ var resourceGroupLocation = resourceGroup().location
 var solutionLocation = resourceGroupLocation
 var baseUrl = 'https://raw.githubusercontent.com/microsoft/document-generation-solution-accelerator/main/'
 
-var ApplicationInsightsName = 'appins-${solutionPrefix}'
-var WorkspaceName = 'worksp-${solutionPrefix}'
+var ApplicationInsightsName = 'appi-${solutionPrefix}'
+var WorkspaceName = 'log-${solutionPrefix}'
 
 // ========== Managed Identity ========== //
 module managedIdentityModule 'deploy_managed_identity.bicep' = {
diff --git a/infra/main.json b/infra/main.json
index e58a472f..5e8eac8c 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.34.1.11899",
-      "templateHash": "10534846592360054965"
+      "version": "0.34.44.8038",
+      "templateHash": "745056846550767942"
     }
   },
   "parameters": {
@@ -93,8 +93,8 @@
     "resourceGroupLocation": "[resourceGroup().location]",
     "solutionLocation": "[variables('resourceGroupLocation')]",
     "baseUrl": "https://raw.githubusercontent.com/microsoft/document-generation-solution-accelerator/main/",
-    "ApplicationInsightsName": "[format('appins-{0}', variables('solutionPrefix'))]",
-    "WorkspaceName": "[format('worksp-{0}', variables('solutionPrefix'))]"
+    "ApplicationInsightsName": "[format('appi-{0}', variables('solutionPrefix'))]",
+    "WorkspaceName": "[format('log-{0}', variables('solutionPrefix'))]"
   },
   "resources": [
     {
@@ -150,8 +150,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "5321954130579291970"
+              "version": "0.34.44.8038",
+              "templateHash": "16854919160820907978"
             }
           },
           "parameters": {
@@ -171,7 +171,7 @@
             },
             "miName": {
               "type": "string",
-              "defaultValue": "[format('{0}-managed-identity', parameters('solutionName'))]",
+              "defaultValue": "[format('id-{0}', parameters('solutionName'))]",
               "metadata": {
                 "description": "Name"
               }
@@ -243,8 +243,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "15644309813710584263"
+              "version": "0.34.44.8038",
+              "templateHash": "998804936838864872"
             }
           },
           "parameters": {
@@ -264,7 +264,7 @@
             }
           },
           "variables": {
-            "keyvaultName": "[format('{0}-kv', parameters('solutionName'))]"
+            "keyvaultName": "[format('kv-{0}', parameters('solutionName'))]"
           },
           "resources": [
             {
@@ -383,8 +383,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "6241332452423283350"
+              "version": "0.34.44.8038",
+              "templateHash": "15569997416548251984"
             }
           },
           "parameters": {
@@ -420,20 +420,20 @@
             }
           },
           "variables": {
-            "storageName": "[format('{0}hubstorage', parameters('solutionName'))]",
+            "storageName": "[format('st{0}hub', parameters('solutionName'))]",
             "storageSkuName": "Standard_LRS",
-            "aiServicesName": "[format('{0}-aiservices', parameters('solutionName'))]",
-            "applicationInsightsName": "[format('{0}-appinsights', parameters('solutionName'))]",
-            "containerRegistryName": "[format('{0}acr', parameters('solutionName'))]",
-            "keyvaultName": "[format('{0}-kv', parameters('solutionName'))]",
+            "aiServicesName": "[format('ais-{0}', parameters('solutionName'))]",
+            "applicationInsightsName": "[format('appi-{0}', parameters('solutionName'))]",
+            "containerRegistryName": "[format('cr-{0}', parameters('solutionName'))]",
+            "keyvaultName": "[format('kv-{0}', parameters('solutionName'))]",
             "location": "[parameters('solutionLocation')]",
-            "aiHubName": "[format('{0}-aihub', parameters('solutionName'))]",
+            "aiHubName": "[format('hub-{0}', parameters('solutionName'))]",
             "aiHubFriendlyName": "[variables('aiHubName')]",
             "aiHubDescription": "AI Hub",
-            "aiProjectName": "[format('{0}-aiproject', parameters('solutionName'))]",
+            "aiProjectName": "[format('proj-{0}', parameters('solutionName'))]",
             "aiProjectFriendlyName": "[variables('aiProjectName')]",
-            "aiSearchName": "[format('{0}-search', parameters('solutionName'))]",
-            "workspaceName": "[format('{0}-workspace', parameters('solutionName'))]",
+            "aiSearchName": "[format('srch-{0}', parameters('solutionName'))]",
+            "workspaceName": "[format('log-{0}-hub', parameters('solutionName'))]",
             "aiModelDeployments": [
               {
                 "name": "[parameters('gptModelName')]",
@@ -981,8 +981,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "5169332991642386736"
+              "version": "0.34.44.8038",
+              "templateHash": "4051638923493896337"
             }
           },
           "parameters": {
@@ -1002,7 +1002,7 @@
             },
             "saName": {
               "type": "string",
-              "defaultValue": "[format('{0}storage', parameters('solutionName'))]",
+              "defaultValue": "[format('st{0}', parameters('solutionName'))]",
               "metadata": {
                 "description": "Name"
               }
@@ -1210,8 +1210,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "12565043404933150402"
+              "version": "0.34.44.8038",
+              "templateHash": "4077975888118623954"
             }
           },
           "parameters": {
@@ -1225,14 +1225,14 @@
             },
             "HostingPlanName": {
               "type": "string",
-              "defaultValue": "[format('{0}-app-service-plan', parameters('solutionName'))]",
+              "defaultValue": "[format('asp-{0}', parameters('solutionName'))]",
               "metadata": {
                 "description": "Name of App Service plan"
               }
             },
             "HostingPlanSku": {
               "type": "string",
-              "defaultValue": "P0v3",
+              "defaultValue": "B1",
               "allowedValues": [
                 "F1",
                 "D1",
@@ -1254,7 +1254,7 @@
             },
             "WebsiteName": {
               "type": "string",
-              "defaultValue": "[format('{0}-app-service', parameters('solutionName'))]",
+              "defaultValue": "[format('app-{0}', parameters('solutionName'))]",
               "metadata": {
                 "description": "Name of Web App"
               }
@@ -1696,8 +1696,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "11157199356947505887"
+              "version": "0.34.44.8038",
+              "templateHash": "6611317231290784098"
             }
           },
           "parameters": {
@@ -1730,7 +1730,7 @@
             }
           },
           "variables": {
-            "accountName": "[format('{0}-cosmos', parameters('solutionName'))]",
+            "accountName": "[format('cosmos-{0}', parameters('solutionName'))]",
             "databaseName": "db_conversation_history",
             "collectionName": "conversations",
             "containers": [
@@ -1919,8 +1919,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.1.11899",
-              "templateHash": "16100001477502640669"
+              "version": "0.34.44.8038",
+              "templateHash": "17578272684671627358"
             }
           },
           "parameters": {
@@ -1953,11 +1953,11 @@
             },
             "containerAppName": {
               "type": "string",
-              "defaultValue": "[format('{0}containerapp', parameters('solutionName'))]"
+              "defaultValue": "[format('ca-{0}', parameters('solutionName'))]"
             },
             "environmentName": {
               "type": "string",
-              "defaultValue": "[format('{0}containerappenv', parameters('solutionName'))]"
+              "defaultValue": "[format('cae-{0}', parameters('solutionName'))]"
             },
             "imageName": {
               "type": "string",