diff --git a/apps/backend/README.md b/apps/backend/README.md
index ff722607..642fd5f1 100644
--- a/apps/backend/README.md
+++ b/apps/backend/README.md
@@ -28,7 +28,7 @@ zip -j backend.zip ../../common/* ./*
 az login -i
 az webapp deployment source config-zip --resource-group "<resource-group-name>" --name "<name-of-backend-app-service>" --src "backend.zip"
 ```
-**Note**: If you get this error: `An error occured during deployment. Status Code: 401`. **Cause**: Some FDPO Azure Subscriptions disable Azure Web Apps Basic Authentication every minute (don't know why). **Solution**:  before running the above `az webapp deployment` command, make sure that your backend azure web app has Basic Authentication ON. In the Azure Portal, you can find this settting in: `Configuration->General Settings`.
+**Note**: If you get this error: `An error occured during deployment. Status Code: 401`. **Cause**: Some FDPO Azure Subscriptions disable Azure Web Apps Basic Authentication every minute (don't know why). **Solution**:  before running the above `az webapp deployment` command, make sure that your backend azure web app has `Basic Authentication ON` and `HTTPS Only ON`. In the Azure Portal, you can find this settting in: `Configuration->General Settings`.
 Don't worry if after running the command it says retrying many times, the zip files already uploaded and is building.
 
 5. In the Azure Portal: **Wait around 5 minutes** and test your bot by going to your Azure Bot Service created in Step 2 and clicking on: **Test in Web Chat**
diff --git a/apps/backend/azuredeploy-backend.bicep b/apps/backend/azuredeploy-backend.bicep
index f4a371c0..d3cdf403 100644
--- a/apps/backend/azuredeploy-backend.bicep
+++ b/apps/backend/azuredeploy-backend.bicep
@@ -26,7 +26,7 @@ param azureOpenAIName string
 param azureOpenAIAPIKey string 
 
 @description('Optional. The model name for the Azure OpenAI service.')
-param azureOpenAIModelName string = 'gpt-4'
+param azureOpenAIModelName string = 'gpt-4-32k'
 
 @description('Optional. The API version for the Azure OpenAI service.')
 param azureOpenAIAPIVersion string = '2023-05-15'
diff --git a/apps/backend/azuredeploy-backend.json b/apps/backend/azuredeploy-backend.json
index 51a92d6f..2f6dbd4c 100644
--- a/apps/backend/azuredeploy-backend.json
+++ b/apps/backend/azuredeploy-backend.json
@@ -61,7 +61,7 @@
     },
     "azureOpenAIModelName": {
       "type": "string",
-      "defaultValue": "gpt-4",
+      "defaultValue": "gpt-4-32k",
       "metadata": {
         "description": "Optional. The model name for the Azure OpenAI service."
       }
diff --git a/apps/frontend/README.md b/apps/frontend/README.md
index ebe5ea48..ea242a78 100644
--- a/apps/frontend/README.md
+++ b/apps/frontend/README.md
@@ -17,7 +17,7 @@ zip frontend.zip ./*
 zip frontend.zip ./pages/*
 zip -j frontend.zip ../../common/*
 ```
-3. Using the Azure CLI deploy the bot code to the Azure App Service created on Step 2
+3. Using the Azure CLI deploy the frontend code to the Azure App Service created on Step 2
 ```bash
 az login -i
 az webapp deployment source config-zip --resource-group "<resource-group-name>" --name "<name-of-frontend-app-service>" --src "frontend.zip"
diff --git a/apps/frontend/azuredeploy-frontend.bicep b/apps/frontend/azuredeploy-frontend.bicep
index 475bbfe7..07513e84 100644
--- a/apps/frontend/azuredeploy-frontend.bicep
+++ b/apps/frontend/azuredeploy-frontend.bicep
@@ -42,7 +42,7 @@ param azureOpenAIName string
 param azureOpenAIAPIKey string 
 
 @description('Optional. The model name of the Azure OpenAI.')
-param azureOpenAIModelName string = 'gpt-4'
+param azureOpenAIModelName string = 'gpt-4-32k'
 
 @description('Optional. The API version of the Azure OpenAI.')
 param azureOpenAIAPIVersion string = '2023-05-15'
diff --git a/apps/frontend/azuredeploy-frontend.json b/apps/frontend/azuredeploy-frontend.json
index 8106b576..7a1409b5 100644
--- a/apps/frontend/azuredeploy-frontend.json
+++ b/apps/frontend/azuredeploy-frontend.json
@@ -89,7 +89,7 @@
     },
     "azureOpenAIModelName": {
       "type": "string",
-      "defaultValue": "gpt-4",
+      "defaultValue": "gpt-4-32k",
       "metadata": {
         "description": "Optional. The model name of the Azure OpenAI."
       }
diff --git a/azuredeploy.bicep b/azuredeploy.bicep
index 33cbf735..7ab46c65 100644
--- a/azuredeploy.bicep
+++ b/azuredeploy.bicep
@@ -87,7 +87,7 @@ resource azureSearch 'Microsoft.Search/searchServices@2021-04-01-Preview' = {
     replicaCount: azureSearchReplicaCount
     partitionCount: azureSearchPartitionCount
     hostingMode: azureSearchHostingMode
-    semanticSearch: 'free'
+    semanticSearch: 'standard'
   }
 }
 
diff --git a/azuredeploy.json b/azuredeploy.json
index deab3259..3133cb97 100644
--- a/azuredeploy.json
+++ b/azuredeploy.json
@@ -168,7 +168,7 @@
         "replicaCount": "[parameters('azureSearchReplicaCount')]",
         "partitionCount": "[parameters('azureSearchPartitionCount')]",
         "hostingMode": "[parameters('azureSearchHostingMode')]",
-        "semanticSearch": "free"
+        "semanticSearch": "standard"
       }
     },
     {