diff --git a/arch/envoy.template.yaml b/arch/envoy.template.yaml
index 40ddd9a8..187db6a8 100644
--- a/arch/envoy.template.yaml
+++ b/arch/envoy.template.yaml
@@ -25,7 +25,7 @@ static_resources:
                         envoy_grpc:
                           cluster_name: opentelemetry_collector
                         timeout: 0.250s
-                      service_name: front_end
+                      service_name: prompt_gateway
                   random_sampling:
                     value: {{ arch_tracing.random_sampling }}
                 {% endif %}
@@ -78,7 +78,7 @@ static_resources:
                         envoy_grpc:
                           cluster_name: opentelemetry_collector
                         timeout: 0.250s
-                      service_name: prompt_gateway
+                      service_name: prompt_internal
                   random_sampling:
                     value: {{ arch_tracing.random_sampling }}
                 {% endif %}
diff --git a/crates/llm_gateway/src/stream_context.rs b/crates/llm_gateway/src/stream_context.rs
index c0e1212c..71896108 100644
--- a/crates/llm_gateway/src/stream_context.rs
+++ b/crates/llm_gateway/src/stream_context.rs
@@ -157,7 +157,6 @@ impl HttpContext for StreamContext {
         );
 
         self.request_id = self.get_http_request_header(REQUEST_ID_HEADER);
-
         Action::Continue
     }