diff --git a/docker-compose.yml b/docker-compose.yml
index 8dd9a27b..2e618d26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,12 +2,15 @@ version: "3.8"
 
 services:
   api:
-    image: evoapicloud/evo-ai:latest
+  # image: evoapicloud/evo-ai:latest Use this image to pull from the repo
+    image: evoai-api:latest # Use this image for local builds
     depends_on:
       - postgres
       - redis
     ports:
       - "8000:8000"
+    env_file:
+      - .env
     environment:
       POSTGRES_CONNECTION_STRING: postgresql://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/evo_ai
       REDIS_HOST: redis
diff --git a/src/utils/mcp_discovery.py b/src/utils/mcp_discovery.py
index b45bbb78..401365fb 100644
--- a/src/utils/mcp_discovery.py
+++ b/src/utils/mcp_discovery.py
@@ -31,8 +31,7 @@ import asyncio
 
 async def _discover_async(config_json: Dict[str, Any]) -> List[Dict[str, Any]]:
     """Return a list[dict] with the tool metadata advertised by the MCP server."""
-
-    from src.services.mcp_service import MCPService
+    from src.services.adk.mcp_service import MCPService
 
     service = MCPService()
     tools, exit_stack = await service._connect_to_mcp_server(config_json)