diff --git a/crates/llm_gateway/src/stream_context.rs b/crates/llm_gateway/src/stream_context.rs
index 62fdae41..93655578 100644
--- a/crates/llm_gateway/src/stream_context.rs
+++ b/crates/llm_gateway/src/stream_context.rs
@@ -186,12 +186,6 @@ impl HttpContext for StreamContext {
     // Envoy's HTTP model is event driven. The WASM ABI has given implementors events to hook onto
     // the lifecycle of the http request and response.
     fn on_http_request_headers(&mut self, _num_headers: usize, _end_of_stream: bool) -> Action {
-        debug!(
-            "on_http_request_headers [S={}] end_stream={}, headers: {:?}",
-            self.context_id,
-            _end_of_stream,
-            self.get_http_request_headers()
-        );
         let request_path = self.get_http_request_header(":path").unwrap_or_default();
         if request_path == HEALTHZ_PATH {
             self.send_http_response(200, vec![], None);
@@ -220,10 +214,17 @@ impl HttpContext for StreamContext {
             }));
         } else {
             self.select_llm_provider();
-            self.add_http_request_header(
-                ARCH_ROUTING_HEADER,
-                &self.llm_provider().provider_interface.to_string(),
-            );
+            if self.llm_provider().endpoint.is_some() {
+                self.add_http_request_header(
+                    ARCH_ROUTING_HEADER,
+                    &self.llm_provider().name.to_string(),
+                );
+            } else {
+                self.add_http_request_header(
+                    ARCH_ROUTING_HEADER,
+                    &self.llm_provider().provider_interface.to_string(),
+                );
+            }
             if let Err(error) = self.modify_auth_headers() {
                 // ensure that the provider has an endpoint if the access key is missing else return a bad request
                 if self.llm_provider.as_ref().unwrap().endpoint.is_none() && !use_agent_orchestrator