diff --git a/azure.yaml b/azure.yaml
index 226ba7af9..4841c2bcc 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -1,14 +1,18 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
-environment:
-  name: multi-agent-custom-automation-engine-solution-accelerator
-  location: eastus
+
 name: multi-agent-custom-automation-engine-solution-accelerator
-# metadata:
-#     template: azd-init@1.13.0
-parameters:
-  baseUrl:
-    type: string
-    default: 'https://github.com/TravisHilbert/Modernize-your-code-solution-accelerator'
-deployment:
-  mode: Incremental
-  template: ./infra/main.bicep  # Path to the main.bicep file inside the 'deployment' folder
+metadata:
+    template: azd-init@1.14.0
+services:
+    backend:
+        project: src/backend
+        host: containerapp
+        language: python
+        docker:
+            path: Dockerfile
+    frontend:
+        project: src/frontend
+        host: containerapp
+        language: python
+        docker:
+            path: Dockerfile
diff --git a/infra/main.bicep b/infra/main.bicep
index fecb5c751..cbf6f03b8 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -1,5 +1,6 @@
 @description('Location for all resources.')
-param location string = 'EastUS2' //Fixed for model availability, change back to resourceGroup().location
+param location string //Fixed for model availability, change back to resourceGroup().location
+
 
 @description('Location for OpenAI resources.')
 param azureOpenAILocation string = 'japaneast' //Fixed for model availability
@@ -7,7 +8,7 @@ param azureOpenAILocation string = 'japaneast' //Fixed for model availability
 
 
 @description('A prefix to add to the start of all resource names. Note: A "unique" suffix will also be added')
-param prefix string = 'macaeo'
+param prefix string = take('macaeo-${uniqueString(resourceGroup().id)}', 10)
 
 @description('Tags to apply to all deployed resources')
 param tags object = {}
diff --git a/infra/main.json b/infra/main.json
index 9f6864aae..3d1bc6d52 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -5,14 +5,13 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.34.44.8038",
-      "templateHash": "2906892014954666053"
+      "version": "0.28.1.47646",
+      "templateHash": "1631755345697758847"
     }
   },
   "parameters": {
     "location": {
       "type": "string",
-      "defaultValue": "EastUS2",
       "metadata": {
         "description": "Location for all resources."
       }
@@ -26,7 +25,7 @@
     },
     "prefix": {
       "type": "string",
-      "defaultValue": "macaeo",
+      "defaultValue": "[take(format('macaeo-{0}', uniqueString(resourceGroup().id)), 10)]",
       "metadata": {
         "description": "A prefix to add to the start of all resource names. Note: A \"unique\" suffix will also be added"
       }
@@ -245,6 +244,7 @@
       },
       "dependsOn": [
         "aiServices",
+        "aoaiUserRoleDefinition",
         "containerApp"
       ]
     },
@@ -403,9 +403,9 @@
       "dependsOn": [
         "aiServices",
         "appInsights",
+        "cosmos::autogenDb",
         "containerAppEnv",
         "cosmos",
-        "cosmos::autogenDb",
         "cosmos::autogenDb::memoryContainer",
         "pullIdentity"
       ],
@@ -500,8 +500,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.44.8038",
-              "templateHash": "10664495342911727649"
+              "version": "0.28.1.47646",
+              "templateHash": "9096960510978747660"
             }
           },
           "parameters": {
@@ -638,8 +638,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.44.8038",
-              "templateHash": "12550713338937452696"
+              "version": "0.28.1.47646",
+              "templateHash": "8215150938757657777"
             }
           },
           "parameters": {
@@ -1028,8 +1028,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.44.8038",
-              "templateHash": "11364190519186458619"
+              "version": "0.28.1.47646",
+              "templateHash": "15814429030073463584"
             }
           },
           "parameters": {
diff --git a/next-steps.md b/next-steps.md
index 3203dfccc..b68d0f3f1 100644
--- a/next-steps.md
+++ b/next-steps.md
@@ -17,7 +17,8 @@ To troubleshoot any issues, see [troubleshooting](#troubleshooting).
 
 ### Configure environment variables for running services
 
-Configure environment variables for running services by updating `settings` in [main.parameters.json](./infra/main.parameters.json).
+Environment variables can be configured by modifying the `env` settings in [resources.bicep](./infra/resources.bicep).
+To define a secret, add the variable as a `secretRef` pointing to a `secrets` entry or a stored KeyVault secret.
 
 ### Configure CI/CD pipeline
 
diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt
index 931e832c6..443a97dc3 100644
--- a/src/backend/requirements.txt
+++ b/src/backend/requirements.txt
@@ -1,5 +1,7 @@
 fastapi
 uvicorn
+autogen-agentchat==0.4.0dev1
+autogen-core==0.4.0dev1
 azure-cosmos
 azure-monitor-opentelemetry
 azure-monitor-events-extension