diff --git a/docker-compose-cpu.yml b/docker-compose-cpu.yml
index 2b72db64..cfe082f1 100644
--- a/docker-compose-cpu.yml
+++ b/docker-compose-cpu.yml
@@ -63,6 +63,11 @@ services:
       - OPENSEARCH_USERNAME=admin
       - OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}
       - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+      - WATSONX_API_KEY=${WATSONX_API_KEY}
+      - WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
+      - WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
+      - OLLAMA_ENDPOINT=${OLLAMA_ENDPOINT}
       - GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID}
       - GOOGLE_OAUTH_CLIENT_SECRET=${GOOGLE_OAUTH_CLIENT_SECRET}
       - MICROSOFT_GRAPH_OAUTH_CLIENT_ID=${MICROSOFT_GRAPH_OAUTH_CLIENT_ID}
@@ -101,6 +106,11 @@ services:
     environment:
       - LANGFLOW_DEACTIVATE_TRACING=true
       - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+      - WATSONX_API_KEY=${WATSONX_API_KEY}
+      - WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
+      - WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
+      - OLLAMA_BASE_URL=${OLLAMA_ENDPOINT}
       - LANGFLOW_LOAD_FLOWS_PATH=/app/flows
       - LANGFLOW_SECRET_KEY=${LANGFLOW_SECRET_KEY}
       - JWT=None  
diff --git a/docker-compose.yml b/docker-compose.yml
index f976c261..15e4f2c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,9 +40,9 @@ services:
 
   openrag-backend:
     image: phact/openrag-backend:${OPENRAG_VERSION:-latest}
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile.backend
+    build:
+      context: .
+      dockerfile: Dockerfile.backend
     container_name: openrag-backend
     depends_on:
       - langflow
@@ -62,6 +62,11 @@ services:
       - OPENSEARCH_USERNAME=admin
       - OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}
       - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+      - WATSONX_API_KEY=${WATSONX_API_KEY}
+      - WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
+      - WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
+      - OLLAMA_ENDPOINT=${OLLAMA_ENDPOINT}
       - NVIDIA_DRIVER_CAPABILITIES=compute,utility
       - NVIDIA_VISIBLE_DEVICES=all
       - GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID}
@@ -97,12 +102,17 @@ services:
     # build:
     #   context: .
     #   dockerfile: Dockerfile.langflow
-    container_name: langflow
+    # container_name: langflow
     ports:
       - "7860:7860"
     environment:
       - LANGFLOW_DEACTIVATE_TRACING=true
       - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+      - WATSONX_API_KEY=${WATSONX_API_KEY}
+      - WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
+      - WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
+      - OLLAMA_BASE_URL=${OLLAMA_ENDPOINT}
       - LANGFLOW_LOAD_FLOWS_PATH=/app/flows
       - LANGFLOW_SECRET_KEY=${LANGFLOW_SECRET_KEY}
       - JWT=None