diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0323a01..e76f8cb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -10,7 +10,11 @@ services:
     volumes:
       - data:/var/lib/postgresql
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-messages}"]
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-messages}",
+        ]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -33,7 +37,7 @@ services:
       - .env
     environment:
       - LLM_MODEL=${LLM_MODEL:-deepseek}
-      - POSTGRES_HOST=messages_db
+      - POSTGRES_HOST=${POSTGRES_HOST:-db}
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
       - POSTGRES_DB=${POSTGRES_DB:-messages}
diff --git a/src/naliiabot/bot/factories/llm_factory.py b/src/naliiabot/bot/factories/llm_factory.py
index 9244acb..cc27efd 100644
--- a/src/naliiabot/bot/factories/llm_factory.py
+++ b/src/naliiabot/bot/factories/llm_factory.py
@@ -47,6 +47,7 @@ class LLMFactory:
             model=model_name,
             temperature=1,
             max_retries=3,
+            timeout=30
         )
 
         return model
diff --git a/src/naliiabotapi/api/settings.py b/src/naliiabotapi/api/settings.py
index fb9d425..cb284a8 100644
--- a/src/naliiabotapi/api/settings.py
+++ b/src/naliiabotapi/api/settings.py
@@ -6,7 +6,7 @@ class Settings:
     DB_NAME = os.getenv("POSTGRES_DB", "messages")
     DB_USER = os.getenv("POSTGRES_USER", "postgres")
     DB_PASSWORD = os.getenv("POSTGRES_PASSWORD", "postgres")
-    DB_HOST = os.getenv("POSTGRES_HOST", "localhost")
+    DB_HOST = os.getenv("POSTGRES_HOST", "db")
 
     def __init__(self):
         load_dotenv()
diff --git a/src/naliiabotapi/main.py b/src/naliiabotapi/main.py
index 4871875..5da6d10 100644
--- a/src/naliiabotapi/main.py
+++ b/src/naliiabotapi/main.py
@@ -44,6 +44,7 @@ app = FastAPI(
         "API for NaliiaBot, a chatbot that provides "
         "customer service and related topics."),
     version="1.0.0",
+    root_path="/agent/api",
     lifespan=lifespan
 )