diff --git a/demos/use_cases/rag_agent/src/rag_agent/__init__.py b/demos/use_cases/rag_agent/src/rag_agent/__init__.py
index 464ec926..f21cc25b 100644
--- a/demos/use_cases/rag_agent/src/rag_agent/__init__.py
+++ b/demos/use_cases/rag_agent/src/rag_agent/__init__.py
@@ -25,8 +25,10 @@ def main(host, port, agent, transport, rest_server, rest_port):
 
             start_server(host=host, port=rest_port)
             return
-        elif agent == "content_builder":
-            from rag_agent.content_builder_agent import start_server
+        elif agent == "context_builder":
+            from rag_agent.context_builder_agent import (
+                start_server,
+            )
 
             start_server(host=host, port=rest_port)
             return
diff --git a/demos/use_cases/rag_agent/src/rag_agent/content_builder_agent.py b/demos/use_cases/rag_agent/src/rag_agent/context_builder_agent.py
similarity index 91%
rename from demos/use_cases/rag_agent/src/rag_agent/content_builder_agent.py
rename to demos/use_cases/rag_agent/src/rag_agent/context_builder_agent.py
index dd36be2d..ea21fa3f 100644
--- a/demos/use_cases/rag_agent/src/rag_agent/content_builder_agent.py
+++ b/demos/use_cases/rag_agent/src/rag_agent/context_builder_agent.py
@@ -252,4 +252,28 @@ if __name__ == "__main__":
 def start_server(host: str = "localhost", port: int = 8000):
     """Start the REST server."""
     load_knowledge_base()
-    uvicorn.run(app, host=host, port=port)
+    uvicorn.run(
+        app,
+        host=host,
+        port=port,
+        log_config={
+            "version": 1,
+            "disable_existing_loggers": False,
+            "formatters": {
+                "default": {
+                    "format": "%(asctime)s - [CONTEXT_BUILDER] - %(name)s - %(levelname)s - %(message)s",
+                },
+            },
+            "handlers": {
+                "default": {
+                    "formatter": "default",
+                    "class": "logging.StreamHandler",
+                    "stream": "ext://sys.stdout",
+                },
+            },
+            "root": {
+                "level": "INFO",
+                "handlers": ["default"],
+            },
+        },
+    )
diff --git a/demos/use_cases/rag_agent/src/rag_agent/query_rewriter_agent.py b/demos/use_cases/rag_agent/src/rag_agent/query_rewriter_agent.py
index 056df952..446227fe 100644
--- a/demos/use_cases/rag_agent/src/rag_agent/query_rewriter_agent.py
+++ b/demos/use_cases/rag_agent/src/rag_agent/query_rewriter_agent.py
@@ -161,4 +161,28 @@ def parse_query(query):
 
 def start_server(host: str = "localhost", port: int = 8000):
     """Start the REST server."""
-    uvicorn.run(app, host=host, port=port)
+    uvicorn.run(
+        app,
+        host=host,
+        port=port,
+        log_config={
+            "version": 1,
+            "disable_existing_loggers": False,
+            "formatters": {
+                "default": {
+                    "format": "%(asctime)s - [QUERY_REWRITER] - %(name)s - %(levelname)s - %(message)s",
+                },
+            },
+            "handlers": {
+                "default": {
+                    "formatter": "default",
+                    "class": "logging.StreamHandler",
+                    "stream": "ext://sys.stdout",
+                },
+            },
+            "root": {
+                "level": "INFO",
+                "handlers": ["default"],
+            },
+        },
+    )
diff --git a/demos/use_cases/rag_agent/src/rag_agent/response_generator_agent.py b/demos/use_cases/rag_agent/src/rag_agent/response_generator_agent.py
index 6b1c0561..2e430f49 100644
--- a/demos/use_cases/rag_agent/src/rag_agent/response_generator_agent.py
+++ b/demos/use_cases/rag_agent/src/rag_agent/response_generator_agent.py
@@ -275,4 +275,28 @@ async def health_check():
 
 def start_server(host: str = "localhost", port: int = 8000):
     """Start the REST server."""
-    uvicorn.run(app, host=host, port=port)
+    uvicorn.run(
+        app,
+        host=host,
+        port=port,
+        log_config={
+            "version": 1,
+            "disable_existing_loggers": False,
+            "formatters": {
+                "default": {
+                    "format": "%(asctime)s - [RESPONSE_GENERATOR] - %(name)s - %(levelname)s - %(message)s",
+                },
+            },
+            "handlers": {
+                "default": {
+                    "formatter": "default",
+                    "class": "logging.StreamHandler",
+                    "stream": "ext://sys.stdout",
+                },
+            },
+            "root": {
+                "level": "INFO",
+                "handlers": ["default"],
+            },
+        },
+    )
diff --git a/demos/use_cases/rag_agent/start_agents.sh b/demos/use_cases/rag_agent/start_agents.sh
index 1b76722e..85c5cbea 100644
--- a/demos/use_cases/rag_agent/start_agents.sh
+++ b/demos/use_cases/rag_agent/start_agents.sh
@@ -25,8 +25,8 @@ log "Starting query_parser agent on port 10500..."
 uv run python -m rag_agent --rest-server --host 0.0.0.0 --rest-port 10500 --agent query_parser &
 WAIT_FOR_PIDS+=($!)
 
-log "Starting content_builder agent on port 10501..."
-uv run python -m rag_agent --rest-server --host 0.0.0.0 --rest-port 10501 --agent content_builder &
+log "Starting context_builder agent on port 10501..."
+uv run python -m rag_agent --rest-server --host 0.0.0.0 --rest-port 10501 --agent context_builder &
 WAIT_FOR_PIDS+=($!)
 
 log "Starting response_generator agent on port 10502..."