diff --git a/app/mcp_server.py b/app/mcp_server.py
index d1de315..f6461db 100644
--- a/app/mcp_server.py
+++ b/app/mcp_server.py
@@ -5,6 +5,7 @@
 import time
 import collections
 import uuid
+import os
 
 from factory import CreateCommand
 mcp = FastMCP("Caldera API MCP Server")
@@ -45,8 +46,8 @@ def make_post_request(self, endpoint, body):
 
 
 caldera_request = CalderaRequest(
-    url="http://localhost:8888/api/v2/",
-    api_key="ADMIN123",
+    url=os.environ.get("CALDERA_URL", "http://localhost:8888/api/v2/"),
+    api_key=os.environ.get("CALDERA_API_KEY", "ADMIN123"),
 )