diff --git a/infrastructure/deployment.bicep b/infrastructure/deployment.bicep
index 8905f4d87..7a7cf0758 100644
--- a/infrastructure/deployment.bicep
+++ b/infrastructure/deployment.bicep
@@ -608,10 +608,6 @@ resource Function 'Microsoft.Web/sites@2018-11-01' = {
           name: 'AZURE_OPENAI_API_VERSION'
           value: AzureOpenAIApiVersion
         }
-        {
-          name: 'AZURE_OPENAI_EMBEDDING_MODEL'
-          value: AzureOpenAIEmbeddingModel
-        }
         {
           name: 'AZURE_SEARCH_INDEX'
           value: AzureSearchIndex
@@ -654,7 +650,7 @@ resource WebsiteName_appsettings 'Microsoft.Web/sites/config@2021-03-01' = {
     AZURE_OPENAI_MODEL: AzureOpenAIModel
     AZURE_OPENAI_EMBEDDING_MODEL: AzureOpenAIEmbeddingModel
     AZURE_SEARCH_SERVICE: 'https://${AzureCognitiveSearch}.search.windows.net'
-    AZURE_SEARCH_ADMIN_KEY: listAdminKeys('Microsoft.Search/searchServices/${AzureCognitiveSearch}', '2021-04-01-preview').primaryKey
+    AZURE_SEARCH_KEY: listAdminKeys('Microsoft.Search/searchServices/${AzureCognitiveSearch}', '2021-04-01-preview').primaryKey
     AZURE_SEARCH_INDEX: AzureSearchIndex
     AZURE_OPENAI_RESOURCE: AzureOpenAIResource
     AZURE_OPENAI_API_VERSION: AzureOpenAIApiVersion
diff --git a/infrastructure/deployment.json b/infrastructure/deployment.json
index 0dc479927..a6bf275fb 100644
--- a/infrastructure/deployment.json
+++ b/infrastructure/deployment.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.18.4.5664",
-      "templateHash": "9064503876030802325"
+      "templateHash": "239101504726205340"
     }
   },
   "parameters": {
@@ -202,13 +202,6 @@
         "description": "Whether or not to stream responses from Azure OpenAI"
       }
     },
-    "AzureOpenAIDeploymentType": {
-      "type": "string",
-      "defaultValue": "Chat",
-      "metadata": {
-        "description": "Azure OpenAI Deployment Type. Text (e.g. text-davinci-003) or Chat (e.g. gpt-35-turbo or gpt-4)"
-      }
-    },
     "AzureOpenAIEmbeddingModel": {
       "type": "string",
       "defaultValue": "text-embedding-ada-002",
@@ -782,10 +775,6 @@
               "name": "AZURE_OPENAI_API_VERSION",
               "value": "[parameters('AzureOpenAIApiVersion')]"
             },
-            {
-              "name": "AZURE_OPENAI_EMBEDDING_MODEL",
-              "value": "[parameters('AzureOpenAIEmbeddingModel')]"
-            },
             {
               "name": "AZURE_SEARCH_INDEX",
               "value": "[parameters('AzureSearchIndex')]"
@@ -834,7 +823,7 @@
         "AZURE_OPENAI_MODEL": "[parameters('AzureOpenAIModel')]",
         "AZURE_OPENAI_EMBEDDING_MODEL": "[parameters('AzureOpenAIEmbeddingModel')]",
         "AZURE_SEARCH_SERVICE": "[format('https://{0}.search.windows.net', parameters('AzureCognitiveSearch'))]",
-        "AZURE_SEARCH_ADMIN_KEY": "[listAdminKeys(format('Microsoft.Search/searchServices/{0}', parameters('AzureCognitiveSearch')), '2021-04-01-preview').primaryKey]",
+        "AZURE_SEARCH_KEY": "[listAdminKeys(format('Microsoft.Search/searchServices/{0}', parameters('AzureCognitiveSearch')), '2021-04-01-preview').primaryKey]",
         "AZURE_SEARCH_INDEX": "[parameters('AzureSearchIndex')]",
         "AZURE_OPENAI_RESOURCE": "[parameters('AzureOpenAIResource')]",
         "AZURE_OPENAI_API_VERSION": "[parameters('AzureOpenAIApiVersion')]",