diff --git a/arch/envoy.template.yaml b/arch/envoy.template.yaml
index c6bcedba..070aa919 100644
--- a/arch/envoy.template.yaml
+++ b/arch/envoy.template.yaml
@@ -184,7 +184,7 @@ static_resources:
             - name: envoy.filters.network.http_connection_manager
               typed_config:
                 "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-                {% if arch_tracing.random_sampling > 0 %}
+                {% if "random_sampling" in arch_tracing and arch_tracing["random_sampling"] > 0 %}
                 generate_request_id: true
                 tracing:
                   provider:
diff --git a/demos/insurance_agent/docker-compose.yaml b/demos/insurance_agent/docker-compose.yaml
index c5ca405e..5a44b9a2 100644
--- a/demos/insurance_agent/docker-compose.yaml
+++ b/demos/insurance_agent/docker-compose.yaml
@@ -15,8 +15,6 @@ services:
       context: ../../chatbot_ui
       dockerfile: Dockerfile
     ports:
-      - "18090:8080"
+      - "18080:8080"
     environment:
-      - OPENAI_API_KEY=${OPENAI_API_KEY:?error}
-      - MISTRAL_API_KEY=${MISTRAL_API_KEY:?error}
       - CHAT_COMPLETION_ENDPOINT=http://host.docker.internal:10000/v1