diff --git a/.github/workflows/azure-dev-validation.yml b/.github/workflows/azure-dev.yml
similarity index 95%
rename from .github/workflows/azure-dev-validation.yml
rename to .github/workflows/azure-dev.yml
index 72d87866a..529300d86 100644
--- a/.github/workflows/azure-dev-validation.yml
+++ b/.github/workflows/azure-dev.yml
@@ -1,6 +1,9 @@
 name: Azure Template Validation
 on:
-  workflow_dispatch: 
+  push:
+    branches:
+      - dev
+      - main 
 
 permissions:
   contents: read
diff --git a/azure.yaml b/azure.yaml
index 53103f565..e0b1a77da 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -1,5 +1,5 @@
 environment:
-  name: BYC-Generic-Accelerator
+  name: Document-generation-solution-accelerator
   location: eastus
 
 parameters:
@@ -11,7 +11,7 @@ parameters:
     default: eastus2
   baseUrl:
     type: string
-    default: 'https://github.com/blessing-sanusi/BYC-Generic-Accelerator'
+    default: 'https://github.com/microsoft/document-generation-solution-accelerator'
 
 deployment:
   mode: Incremental
diff --git a/infra/deploy_app_service.bicep b/infra/deploy_app_service.bicep
index 86c6daffa..1b54adc4e 100644
--- a/infra/deploy_app_service.bicep
+++ b/infra/deploy_app_service.bicep
@@ -41,10 +41,42 @@ param AzureOpenAIKey string
 param azureOpenAIApiVersion string
 param AZURE_OPENAI_RESOURCE string = ''
 param USE_CHAT_HISTORY_ENABLED string = ''
+param aiSearchService string
+param keyvaultName string
+
+@description('Enable Semantic Search in Azure Search')
+param AzureSearchUseSemanticSearch string = ''
+
+@description('Enable In-Domain Search in Azure Search')
+param AzureSearchEnableInDomain string = ''
+
+@description('Azure Search Top K')
+param AzureSearchTopK string = ''
+
+@description('Azure Search Index Is Prechunked')
+param AzureSearchIndexIsPrechunked string = ''
+
+@description('Azure Search Content Columns')
+param AzureSearchContentColumns string = ''
+
+@description('Azure Search Title Column')
+param AzureSearchTitleColumn string = ''
+
+@description('Azure Search URL Column')
+param AzureSearchUrlColumn string = ''
+
+@description('Azure Search Filename Column')
+param AzureSearchFilenameColumn string = ''
+
+@description('Azure Search Semantic Search Config')
+param AzureSearchSemanticSearchConfig string = ''
 
 @description('Azure Cosmos DB Account')
 param AZURE_COSMOSDB_ACCOUNT string = ''
 
+@description('Azure Search Index')
+param AzureSearchIndex string = ''
+
 @description('Azure Cosmos DB Conversations Container')
 param AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = ''
 
@@ -96,6 +128,54 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
           name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
           value: reference(applicationInsightsId, '2015-05-01').InstrumentationKey
         }
+        {
+          name: 'AZURE_SEARCH_SERVICE'
+          value: aiSearchService
+        }
+        {
+          name: 'AZURE_SEARCH_INDEX'
+          value: AzureSearchIndex
+        }
+        {
+          name: 'AZURE_SEARCH_KEY'
+          value:keyvaultName
+        }
+        {
+          name: 'AZURE_SEARCH_USE_SEMANTIC_SEARCH'
+          value: AzureSearchUseSemanticSearch
+        }
+        {
+          name: 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG'
+          value: AzureSearchSemanticSearchConfig
+        }
+        {
+          name: 'AZURE_SEARCH_INDEX_IS_PRECHUNKED'
+          value: AzureSearchIndexIsPrechunked
+        }
+        {
+          name: 'AZURE_SEARCH_TOP_K'
+          value: AzureSearchTopK
+        }
+        {
+          name: 'AZURE_SEARCH_ENABLE_IN_DOMAIN'
+          value: AzureSearchEnableInDomain
+        }
+        {
+          name: 'AZURE_SEARCH_CONTENT_COLUMNS'
+          value: AzureSearchContentColumns
+        }
+        {
+          name: 'AZURE_SEARCH_FILENAME_COLUMN'
+          value: AzureSearchFilenameColumn
+        }
+        {
+          name: 'AZURE_SEARCH_TITLE_COLUMN'
+          value: AzureSearchTitleColumn
+        }
+        {
+          name: 'AZURE_SEARCH_URL_COLUMN'
+          value: AzureSearchUrlColumn
+        }
         {
           name: 'AZURE_OPENAI_API_VERSION'
           value: azureOpenAIApiVersion