diff --git a/neuro_san/internals/run_context/langchain/llms/standard_langchain_llm_factory.py b/neuro_san/internals/run_context/langchain/llms/standard_langchain_llm_factory.py
index cbab9b1d9..e5885ec87 100644
--- a/neuro_san/internals/run_context/langchain/llms/standard_langchain_llm_factory.py
+++ b/neuro_san/internals/run_context/langchain/llms/standard_langchain_llm_factory.py
@@ -142,7 +142,8 @@ def create_base_chat_model(self, config: Dict[str, Any],
                             # Azure-specific
                             azure_endpoint=self.get_value_or_env(config, "azure_endpoint",
                                                                  "AZURE_OPENAI_ENDPOINT"),
-                            deployment_name=config.get("deployment_name"),
+                            deployment_name=self.get_value_or_env(config, "deployment_name",
+                                                                  "AZURE_OPENAI_DEPLOYMENT_NAME"),
                             openai_api_version=self.get_value_or_env(config, "openai_api_version",
                                                                      "OPENAI_API_VERSION"),
 
diff --git a/neuro_san/internals/run_context/langchain/util/api_key_error_check.py b/neuro_san/internals/run_context/langchain/util/api_key_error_check.py
index 62c404a4d..143fa7e7e 100644
--- a/neuro_san/internals/run_context/langchain/util/api_key_error_check.py
+++ b/neuro_san/internals/run_context/langchain/util/api_key_error_check.py
@@ -27,7 +27,8 @@
                               "Connection error"],
     "OPENAI_API_VERSION": ["validation error", "api_version", "OPENAI_API_VERSION", "Error code: 404",
                            "Resource not found"],
-    "deployment_name": ["Error code: 404", "Resource not found", "API deployment for this resource does not exist"],
+    "AZURE_OPENAI_DEPLOYMENT_NAME": ["Error code: 404", "Resource not found",
+                                     "API deployment for this resource does not exist"],
 }