diff --git a/chatbot_ui/Dockerfile b/chatbot_ui/Dockerfile
index f05aad18..5c83012a 100644
--- a/chatbot_ui/Dockerfile
+++ b/chatbot_ui/Dockerfile
@@ -1,10 +1,5 @@
-# copied from https://github.com/bergos/embedding-server
-
 FROM python:3 AS base
 
-#
-# builder
-#
 FROM base AS builder
 
 WORKDIR /src
diff --git a/chatbot_ui/app/run.py b/chatbot_ui/app/run.py
index 10c8c603..c0d81a8c 100644
--- a/chatbot_ui/app/run.py
+++ b/chatbot_ui/app/run.py
@@ -1,9 +1,12 @@
 import os
 from openai import OpenAI
 import gradio as gr
+from dotenv import load_dotenv
+
+load_dotenv()
 
 OPEN_API_KEY=os.getenv("OPENAI_API_KEY")
-CHAT_COMPLETION_ENDPOINT = os.getenv("CHAT_COMPLETION_ENDPOINT", "https://api.openai.com/v1")
+CHAT_COMPLETION_ENDPOINT = os.getenv("CHAT_COMPLETION_ENDPOINT")
 MODEL_NAME = os.getenv("MODEL_NAME", "gpt-3.5-turbo")
 
 client = OpenAI(api_key=OPEN_API_KEY, base_url=CHAT_COMPLETION_ENDPOINT)
diff --git a/chatbot_ui/requirements.txt b/chatbot_ui/requirements.txt
index 6e1cce4f..26131d36 100644
--- a/chatbot_ui/requirements.txt
+++ b/chatbot_ui/requirements.txt
@@ -5,3 +5,4 @@ asyncio==3.4.3
 httpx==0.27.0
 python-dotenv==1.0.1
 pydantic==2.8.2
+openai==1.46.1
diff --git a/demos/function_calling/docker-compose.yaml b/demos/function_calling/docker-compose.yaml
index 5f0b05b8..11913b89 100644
--- a/demos/function_calling/docker-compose.yaml
+++ b/demos/function_calling/docker-compose.yaml
@@ -85,6 +85,8 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
     restart: unless-stopped
+    profiles:
+      - monitoring
 
   chatbot_ui:
     build:
@@ -94,7 +96,7 @@ services:
       - "18080:8080"
     environment:
       - OPENAI_API_KEY=${OPENAI_API_KEY:?error}
-      - CHAT_COMPLETION_ENDPOINT=http://bolt:10000/v1/chat/completions
+      - CHAT_COMPLETION_ENDPOINT=http://bolt:10000/v1
 
   prometheus:
     image: prom/prometheus
diff --git a/demos/network_copilot/docker-compose.yaml b/demos/network_copilot/docker-compose.yaml
index 5f0b05b8..54e2c30e 100644
--- a/demos/network_copilot/docker-compose.yaml
+++ b/demos/network_copilot/docker-compose.yaml
@@ -94,7 +94,7 @@ services:
       - "18080:8080"
     environment:
       - OPENAI_API_KEY=${OPENAI_API_KEY:?error}
-      - CHAT_COMPLETION_ENDPOINT=http://bolt:10000/v1/chat/completions
+      - CHAT_COMPLETION_ENDPOINT=http://bolt:10000/v1
 
   prometheus:
     image: prom/prometheus
diff --git a/demos/prompt_guards/docker-compose.yaml b/demos/prompt_guards/docker-compose.yaml
index be92f250..99120c23 100644
--- a/demos/prompt_guards/docker-compose.yaml
+++ b/demos/prompt_guards/docker-compose.yaml
@@ -79,4 +79,4 @@ services:
       - "18080:8080"
     environment:
       - OPENAI_API_KEY=${OPENAI_API_KEY}
-      - CHAT_COMPLETION_ENDPOINT=http://bolt:10000/v1/chat/completions
+      - CHAT_COMPLETION_ENDPOINT=http://bolt:10000/v1
diff --git a/envoyfilter/docker-compose.yaml b/envoyfilter/docker-compose.yaml
index 3953a1b1..37a70ecc 100644
--- a/envoyfilter/docker-compose.yaml
+++ b/envoyfilter/docker-compose.yaml
@@ -40,4 +40,4 @@ services:
     ports:
       - "18080:8080"
     environment:
-      - CHAT_COMPLETION_ENDPOINT=http://envoy:10000/v1/chat/completions
+      - CHAT_COMPLETION_ENDPOINT=http://envoy:10000/v1