diff --git a/demos/function_calling/docker-compose.yaml b/demos/function_calling/docker-compose.yaml
index 40a01743..0109e4fb 100644
--- a/demos/function_calling/docker-compose.yaml
+++ b/demos/function_calling/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
 
   chatbot_ui:
     build:
-      context: ../../chatbot_ui
+      context: ../shared/chatbot_ui
     ports:
       - "18080:8080"
     environment:
diff --git a/demos/hr_agent/arch_config.yaml b/demos/hr_agent/arch_config.yaml
index f2237e35..71baa08e 100644
--- a/demos/hr_agent/arch_config.yaml
+++ b/demos/hr_agent/arch_config.yaml
@@ -9,7 +9,7 @@ llm_providers:
   - name: OpenAI
     provider: openai
     access_key: OPENAI_API_KEY
-    model: gpt-4o
+    model: gpt-4o-mini
     default: true
 
 # Arch creates a round-robin load balancing between different endpoints, managed via the cluster subsystem.
diff --git a/demos/hr_agent/docker-compose.yaml b/demos/hr_agent/docker-compose.yaml
index 9607d0a6..1067ba6c 100644
--- a/demos/hr_agent/docker-compose.yaml
+++ b/demos/hr_agent/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
 
   chatbot_ui:
     build:
-      context: ../../chatbot_ui
+      context: ../shared/chatbot_ui
     ports:
       - "18080:8080"
     environment:
diff --git a/demos/insurance_agent/docker-compose.yaml b/demos/insurance_agent/docker-compose.yaml
index f6f124d5..a4bd27bd 100644
--- a/demos/insurance_agent/docker-compose.yaml
+++ b/demos/insurance_agent/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
 
   chatbot_ui:
     build:
-      context: ../../chatbot_ui
+      context: ../shared/chatbot_ui
       dockerfile: Dockerfile
     ports:
       - "18080:8080"
diff --git a/demos/network_agent/docker-compose.yaml b/demos/network_agent/docker-compose.yaml
index 5abffec4..d04b55cc 100644
--- a/demos/network_agent/docker-compose.yaml
+++ b/demos/network_agent/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
 
   chatbot_ui:
     build:
-      context: ../../chatbot_ui
+      context: ../shared/chatbot_ui
       dockerfile: Dockerfile
     ports:
       - "18080:8080"
diff --git a/chatbot_ui/.vscode/launch.json b/demos/shared/chatbot_ui/.vscode/launch.json
similarity index 100%
rename from chatbot_ui/.vscode/launch.json
rename to demos/shared/chatbot_ui/.vscode/launch.json
diff --git a/chatbot_ui/Dockerfile b/demos/shared/chatbot_ui/Dockerfile
similarity index 100%
rename from chatbot_ui/Dockerfile
rename to demos/shared/chatbot_ui/Dockerfile
diff --git a/chatbot_ui/common.py b/demos/shared/chatbot_ui/common.py
similarity index 100%
rename from chatbot_ui/common.py
rename to demos/shared/chatbot_ui/common.py
diff --git a/chatbot_ui/requirements.txt b/demos/shared/chatbot_ui/requirements.txt
similarity index 100%
rename from chatbot_ui/requirements.txt
rename to demos/shared/chatbot_ui/requirements.txt
diff --git a/chatbot_ui/run_stream.py b/demos/shared/chatbot_ui/run_stream.py
similarity index 100%
rename from chatbot_ui/run_stream.py
rename to demos/shared/chatbot_ui/run_stream.py