diff --git a/src/cai/agents/android_sast_agent.py b/src/cai/agents/android_sast_agent.py
index 366014e4..e3b606d0 100644
--- a/src/cai/agents/android_sast_agent.py
+++ b/src/cai/agents/android_sast_agent.py
@@ -41,7 +41,7 @@ app_logic_mapper = Agent(
     tools=tools,
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
 )
 
@@ -61,7 +61,7 @@ android_sast = Agent(
         ],
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
 )
 
diff --git a/src/cai/agents/blue_teamer.py b/src/cai/agents/blue_teamer.py
index fc401a0d..8a743311 100644
--- a/src/cai/agents/blue_teamer.py
+++ b/src/cai/agents/blue_teamer.py
@@ -44,7 +44,7 @@ blueteam_agent = Agent(
                    Expert in cybersecurity protection and incident response.""",
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
     tools=tools,
 )
diff --git a/src/cai/agents/dfir.py b/src/cai/agents/dfir.py
index 50dd013b..6226885e 100644
--- a/src/cai/agents/dfir.py
+++ b/src/cai/agents/dfir.py
@@ -63,7 +63,7 @@ dfir_agent = Agent(
                    Expert in investigation and analysis of digital evidence.""",
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
     tools=tools,
 
diff --git a/src/cai/agents/memory.py b/src/cai/agents/memory.py
index 238bacee..97bd1d16 100644
--- a/src/cai/agents/memory.py
+++ b/src/cai/agents/memory.py
@@ -82,11 +82,13 @@ Environment Variables enabling the episodic memory store
 """
 
 import os
+from openai import AsyncOpenAI
 from cai.sdk.agents import Agent, OpenAIChatCompletionsModel
 from cai.tools.misc.rag import add_to_memory_semantic, add_to_memory_episodic
 
 # Get model from environment or use default
 model = os.getenv('CAI_MODEL', "alias1")
+model_name = model
 
 
 def get_previous_steps(query: str) -> str:
@@ -198,7 +200,7 @@ semantic_builder = Agent(
     tools=[add_to_memory_semantic],
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
 
@@ -213,7 +215,7 @@ episodic_builder = Agent(
     tools=[add_to_memory_episodic],
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
 
@@ -227,6 +229,6 @@ query_agent = Agent(
     temperature=0,
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
diff --git a/src/cai/agents/memory_analysis_agent.py b/src/cai/agents/memory_analysis_agent.py
index cfa9a452..11dc8c7d 100644
--- a/src/cai/agents/memory_analysis_agent.py
+++ b/src/cai/agents/memory_analysis_agent.py
@@ -44,6 +44,6 @@ memory_analysis_agent = Agent(
     tools=functions,
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
diff --git a/src/cai/agents/network_traffic_analyzer.py b/src/cai/agents/network_traffic_analyzer.py
index 725c34af..85c1d7d8 100644
--- a/src/cai/agents/network_traffic_analyzer.py
+++ b/src/cai/agents/network_traffic_analyzer.py
@@ -77,7 +77,7 @@ network_security_analyzer_agent = Agent(
                    Expert in monitoring, capturing, and analyzing network communications for security threats.""",
         model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
     tools=tools,
     handoffs=[ # Handoff to DFIR agent for further analysis
diff --git a/src/cai/agents/replay_attack_agent.py b/src/cai/agents/replay_attack_agent.py
index 5ac98329..63f90c8e 100644
--- a/src/cai/agents/replay_attack_agent.py
+++ b/src/cai/agents/replay_attack_agent.py
@@ -69,7 +69,7 @@ replay_attack_agent = Agent(
                    Expert in packet manipulation, traffic replay, and protocol exploitation.""",
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
     tools=tools,
 )
diff --git a/src/cai/agents/reporter.py b/src/cai/agents/reporter.py
index ee2828f1..f20fcf7d 100644
--- a/src/cai/agents/reporter.py
+++ b/src/cai/agents/reporter.py
@@ -32,6 +32,6 @@ reporting_agent = Agent(
     tools=functions,
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
diff --git a/src/cai/agents/reverse_engineering_agent.py b/src/cai/agents/reverse_engineering_agent.py
index 414e1b1a..b57b855b 100644
--- a/src/cai/agents/reverse_engineering_agent.py
+++ b/src/cai/agents/reverse_engineering_agent.py
@@ -45,6 +45,6 @@ reverse_engineering_agent = Agent(
     tools=functions,
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
diff --git a/src/cai/agents/subghz_sdr_agent.py b/src/cai/agents/subghz_sdr_agent.py
index 8701a9c7..227438db 100644
--- a/src/cai/agents/subghz_sdr_agent.py
+++ b/src/cai/agents/subghz_sdr_agent.py
@@ -44,6 +44,6 @@ subghz_sdr_agent = Agent(
     tools=functions,
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )
diff --git a/src/cai/agents/usecase.py b/src/cai/agents/usecase.py
index 7d8f4455..a1f3f0e8 100644
--- a/src/cai/agents/usecase.py
+++ b/src/cai/agents/usecase.py
@@ -37,7 +37,7 @@ use_case_agent = Agent(
     tools=tools,
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
 )
 
diff --git a/src/cai/agents/web_pentester.py b/src/cai/agents/web_pentester.py
index 56da16fb..d2c3a83f 100644
--- a/src/cai/agents/web_pentester.py
+++ b/src/cai/agents/web_pentester.py
@@ -52,7 +52,7 @@ web_pentester_agent = Agent(
     output_guardrails=output_guardrails,
     model=OpenAIChatCompletionsModel(
         model=model_name,
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     ),
 )
 
diff --git a/src/cai/agents/wifi_security_tester.py b/src/cai/agents/wifi_security_tester.py
index cc685365..40c06d5a 100644
--- a/src/cai/agents/wifi_security_tester.py
+++ b/src/cai/agents/wifi_security_tester.py
@@ -43,6 +43,6 @@ wifi_security_agent = Agent(
     tools=functions,
     model=OpenAIChatCompletionsModel(
         model=os.getenv('CAI_MODEL', "alias1"),
-        openai_client=AsyncOpenAI(),
+        openai_client=AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY", "sk-placeholder")),
     )
 )