diff --git a/README.md b/README.md
index 9cc250ad..921d309f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-Arch is an **intelligent proxy server designed for prompts** - to help you protect, observe, and build agentic apps by simply integrating (existing) APIs. Built by the contributors of [Envoy Proxy](https://www.envoyproxy.io/) with the belief that:
+Focus on what matters most. Arch is an **intelligent proxy server designed for prompts** - to help you protect, observe, and build agentic apps by simply connecting (existing) APIs.
+
+Built by the contributors of [Envoy Proxy](https://www.envoyproxy.io/) with the belief that:
 
 >Prompts are nuanced and opaque user requests, which require the same capabilities as traditional HTTP requests including secure handling, intelligent routing, robust observability, and integration with backend (API) systems for personalization – outside core business logic.*
 
@@ -58,7 +60,7 @@ Arch's CLI allows you to manage and interact with the Arch gateway efficiently.
 ```console
 $ python -m venv venv
 $ source venv/bin/activate   # On Windows, use: venv\Scripts\activate
-$ pip install archgw==0.1.9
+$ pip install archgw==0.2.0
 ```
 
 ### Build AI Agent with Arch Gateway
diff --git a/arch/arch_config_schema.yaml b/arch/arch_config_schema.yaml
index e8c7e348..b532117c 100644
--- a/arch/arch_config_schema.yaml
+++ b/arch/arch_config_schema.yaml
@@ -61,6 +61,11 @@ properties:
           type: boolean
         endpoint:
           type: string
+        protocol:
+          type: string
+          enum:
+            - http
+            - https
       additionalProperties: false
       required:
         - name
diff --git a/arch/envoy.template.yaml b/arch/envoy.template.yaml
index 17147cc7..588c6f66 100644
--- a/arch/envoy.template.yaml
+++ b/arch/envoy.template.yaml
@@ -567,6 +567,18 @@ static_resources:
                       address: {{ local_llm_provider.endpoint }}
                       port_value: {{ local_llm_provider.port }}
                   hostname: {{ local_llm_provider.endpoint }}
+      {% if local_llm_provider.protocol == "https" %}
+      transport_socket:
+        name: envoy.transport_sockets.tls
+        typed_config:
+          "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
+          sni: {{ local_llm_provider.endpoint }}
+          common_tls_context:
+            tls_params:
+              tls_minimum_protocol_version: TLSv1_2
+              tls_maximum_protocol_version: TLSv1_3
+      {% endif %}
+
 {% endfor %}
     - name: arch_internal
       connect_timeout: 5s
diff --git a/arch/tools/README.md b/arch/tools/README.md
index a84e423c..9a2c6e14 100644
--- a/arch/tools/README.md
+++ b/arch/tools/README.md
@@ -19,7 +19,7 @@ source venv/bin/activate
 
 ### Step 3: Run the build script
 ```bash
-pip install archgw==0.1.9
+pip install archgw==0.2.0
 ```
 
 ## Uninstall Instructions: archgw CLI
diff --git a/arch/tools/poetry.lock b/arch/tools/poetry.lock
index f3cf27bd..21f2772c 100644
--- a/arch/tools/poetry.lock
+++ b/arch/tools/poetry.lock
@@ -2,7 +2,7 @@
 
 [[package]]
 name = "archgw_modelserver"
-version = "0.1.9"
+version = "0.2.0"
 description = "A model server for serving models"
 optional = false
 python-versions = "*"
@@ -568,4 +568,4 @@ zstd = ["zstandard (>=0.18.0)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "6de280d17cc7131265568e89c10c22af1a5e4ac5a99d5ce0585135d95119ee64"
+content-hash = "59543baf4d462d4830e7228ba9eda8ae865416fdabd8ede129492ac45f1926f2"
diff --git a/arch/tools/pyproject.toml b/arch/tools/pyproject.toml
index 08be8b86..28b3b3ab 100644
--- a/arch/tools/pyproject.toml
+++ b/arch/tools/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "archgw"
-version = "0.1.9"
+version = "0.2.0"
 description = "Python-based CLI tool to manage Arch Gateway."
 authors = ["Katanemo Labs, Inc."]
 packages = [
@@ -10,7 +10,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-archgw_modelserver = "^0.1.9"
+archgw_modelserver = "^0.2.0"
 click = "^8.1.7"
 jinja2 = "^3.1.4"
 jsonschema = "^4.23.0"
diff --git a/demos/currency_exchange/arch_config.yaml b/demos/currency_exchange/arch_config.yaml
index 64e0f253..f8776c48 100644
--- a/demos/currency_exchange/arch_config.yaml
+++ b/demos/currency_exchange/arch_config.yaml
@@ -9,7 +9,7 @@ listener:
 llm_providers:
   - name: gpt-4o
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o
 
 system_prompt: |
diff --git a/demos/currency_exchange_ollama/arch_config.yaml b/demos/currency_exchange_ollama/arch_config.yaml
index 5936ff17..5cb77750 100644
--- a/demos/currency_exchange_ollama/arch_config.yaml
+++ b/demos/currency_exchange_ollama/arch_config.yaml
@@ -7,6 +7,7 @@ listener:
   connect_timeout: 0.005s
 
 llm_providers:
+
   - name: local-llama
     provider_interface: openai
     model: llama3.2
diff --git a/demos/hr_agent/arch_config.yaml b/demos/hr_agent/arch_config.yaml
index e7bf60f2..09264821 100644
--- a/demos/hr_agent/arch_config.yaml
+++ b/demos/hr_agent/arch_config.yaml
@@ -7,7 +7,7 @@ listener:
 # Centralized way to manage LLMs, manage keys, retry logic, failover and limits in a central way
 llm_providers:
   - name: OpenAI
-    provider: openai
+    provider_interface: openai
     access_key: $OPENAI_API_KEY
     model: gpt-4o-mini
     default: true
diff --git a/demos/insurance_agent/arch_config.yaml b/demos/insurance_agent/arch_config.yaml
index ce8a0088..9e5c6ed3 100644
--- a/demos/insurance_agent/arch_config.yaml
+++ b/demos/insurance_agent/arch_config.yaml
@@ -9,7 +9,7 @@ system_prompt: |
 
 llm_providers:
   - name: OpenAI
-    provider: openai
+    provider_interface: openai
     access_key: $OPENAI_API_KEY
     model: gpt-4o
     default: true
diff --git a/demos/llm_routing/README.md b/demos/llm_routing/README.md
index f5a49971..8418b7f8 100644
--- a/demos/llm_routing/README.md
+++ b/demos/llm_routing/README.md
@@ -1,5 +1,5 @@
 # LLM Routing
-This demo shows how you can arch gateway to manage keys and route to appropricate LLM.
+This demo shows how you can arch gateway to manage keys and route to appropriate LLM.
 
 # Starting the demo
 1. Please make sure the [pre-requisites](https://github.com/katanemo/arch/?tab=readme-ov-file#prerequisites) are installed correctly
@@ -9,11 +9,50 @@ This demo shows how you can arch gateway to manage keys and route to appropricat
    ```
 1. Navigate to http://localhost:18080/
 
+Following screen shows an example of interaction with arch gateway showing dynamic routing. You can select between different LLMs using "override model" option in the chat UI.
+
+![LLM Routing Demo](llm_routing_demo.png)
+
+You can also pass in a header to override model when sending prompt. Following example shows how you can use `x-arch-llm-provider-hint` header to override model selection,
+
+```bash
+
+$ curl --header 'Content-Type: application/json' \
+  --header 'x-arch-llm-provider-hint: ministral-3b' \
+  --data '{"messages": [{"role": "user","content": "hello"}]}' \
+  http://localhost:12000/v1/chat/completions 2> /dev/null | jq .
+{
+  "id": "xxx",
+  "object": "chat.completion",
+  "created": 1737760394,
+  "model": "ministral-3b-latest",
+  "choices": [
+    {
+      "index": 0,
+      "message": {
+        "role": "assistant",
+        "tool_calls": null,
+        "content": "Hello! How can I assist you today? Let's chat about anything you'd like. 😊"
+      },
+      "finish_reason": "stop"
+    }
+  ],
+  "usage": {
+    "prompt_tokens": 4,
+    "total_tokens": 25,
+    "completion_tokens": 21
+  }
+}
+
+```
+
 # Observability
-Arch gateway publishes stats endpoint at http://localhost:19901/stats. In this demo we are using prometheus to pull stats from arch and we are using grafana to visalize the stats in dashboard. To see grafana dashboard follow instructions below,
+Arch gateway publishes stats endpoint at http://localhost:19901/stats. In this demo we are using prometheus to pull stats from arch and we are using grafana to visualize the stats in dashboard. To see grafana dashboard follow instructions below,
 
 1. Navigate to http://localhost:3000/ to open grafana UI (use admin/grafana as credentials)
 1. From grafana left nav click on dashboards and select "Intelligent Gateway Overview" to view arch gateway stats
+1. For tracing you can head over to http://localhost:16686/ to view recent traces.
 
-# Selecting different LLM
-You can pick different LLM based on header `x-arch-llm-provider-hint` to override default LLM.
+Following is a screenshot of tracing UI showing call received by arch gateway and making upstream call to LLM,
+
+![Jaeger Tracing](jaeger_tracing_llm_routing.png)
diff --git a/demos/llm_routing/arch_config.yaml b/demos/llm_routing/arch_config.yaml
index 620a1d10..f7ce78cd 100644
--- a/demos/llm_routing/arch_config.yaml
+++ b/demos/llm_routing/arch_config.yaml
@@ -9,23 +9,23 @@ listener:
 llm_providers:
   - name: gpt-4o-mini
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o-mini
     default: true
 
   - name: gpt-3.5-turbo-0125
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-3.5-turbo-0125
 
   - name: gpt-4o
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o
 
   - name: ministral-3b
     access_key: $MISTRAL_API_KEY
-    provider: mistral
+    provider_interface: mistral
     model: ministral-3b-latest
 
 tracing:
diff --git a/demos/llm_routing/jaeger_tracing_llm_routing.png b/demos/llm_routing/jaeger_tracing_llm_routing.png
new file mode 100644
index 00000000..e18016d1
Binary files /dev/null and b/demos/llm_routing/jaeger_tracing_llm_routing.png differ
diff --git a/demos/llm_routing/llm_routing_demo.png b/demos/llm_routing/llm_routing_demo.png
new file mode 100644
index 00000000..50f25677
Binary files /dev/null and b/demos/llm_routing/llm_routing_demo.png differ
diff --git a/demos/llm_routing/run_demo.sh b/demos/llm_routing/run_demo.sh
new file mode 100644
index 00000000..c0eafee6
--- /dev/null
+++ b/demos/llm_routing/run_demo.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e
+
+# Function to start the demo
+start_demo() {
+  # Step 1: Check if .env file exists
+  if [ -f ".env" ]; then
+    echo ".env file already exists. Skipping creation."
+  else
+    # Step 2: Create `.env` file and set OpenAI key
+    if [ -z "$OPENAI_API_KEY" ]; then
+      echo "Error: OPENAI_API_KEY environment variable is not set for the demo."
+      exit 1
+    fi
+
+    echo "Creating .env file..."
+    echo "OPENAI_API_KEY=$OPENAI_API_KEY" > .env
+    echo ".env file created with OPENAI_API_KEY."
+  fi
+
+  # Step 3: Start Arch
+  echo "Starting Arch with arch_config.yaml..."
+  archgw up arch_config.yaml
+
+  # Step 4: Start LLM Routing
+  echo "Starting LLM Routing using Docker Compose..."
+  docker compose up -d  # Run in detached mode
+}
+
+# Function to stop the demo
+stop_demo() {
+  # Step 1: Stop Docker Compose services
+  echo "Stopping LLM Routing using Docker Compose..."
+  docker compose down
+
+  # Step 2: Stop Arch
+  echo "Stopping Arch..."
+  archgw down
+}
+
+# Main script logic
+if [ "$1" == "down" ]; then
+  stop_demo
+else
+  # Default action is to bring the demo up
+  start_demo
+fi
diff --git a/demos/multi_turn_rag_agent/arch_config.yaml b/demos/multi_turn_rag_agent/arch_config.yaml
index 0faffd6d..1399965f 100644
--- a/demos/multi_turn_rag_agent/arch_config.yaml
+++ b/demos/multi_turn_rag_agent/arch_config.yaml
@@ -14,7 +14,7 @@ endpoints:
 llm_providers:
   - name: gpt-4o-mini
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o-mini
     default: true
 
diff --git a/demos/network_agent/arch_config.yaml b/demos/network_agent/arch_config.yaml
index f46dd204..ad3bfae5 100644
--- a/demos/network_agent/arch_config.yaml
+++ b/demos/network_agent/arch_config.yaml
@@ -7,7 +7,7 @@ listener:
 # Centralized way to manage LLMs, manage keys, retry logic, failover and limits in a central way
 llm_providers:
   - name: OpenAI
-    provider: openai
+    provider_interface: openai
     access_key: $OPENAI_API_KEY
     model: gpt-3.5-turbo
     default: true
diff --git a/demos/weather_forecast/arch_config.yaml b/demos/weather_forecast/arch_config.yaml
index b2c11df5..94a6bdfb 100644
--- a/demos/weather_forecast/arch_config.yaml
+++ b/demos/weather_forecast/arch_config.yaml
@@ -18,18 +18,18 @@ overrides:
 llm_providers:
   - name: gpt-4o-mini
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o-mini
     default: true
 
   - name: gpt-3.5-turbo-0125
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-3.5-turbo-0125
 
   - name: gpt-4o
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o
 
 system_prompt: |
diff --git a/docs/source/concepts/includes/arch_config.yaml b/docs/source/concepts/includes/arch_config.yaml
index 44da39ff..c78f35f7 100644
--- a/docs/source/concepts/includes/arch_config.yaml
+++ b/docs/source/concepts/includes/arch_config.yaml
@@ -9,7 +9,7 @@ listener:
 # Centralized way to manage LLMs, manage keys, retry logic, failover and limits in a central way
 llm_providers:
   - name: OpenAI
-    provider: openai
+    provider_interface: openai
     access_key: $OPENAI_API_KEY
     model: gpt-4o
     default: true
diff --git a/docs/source/concepts/llm_provider.rst b/docs/source/concepts/llm_provider.rst
index 498ee875..ba9566ba 100644
--- a/docs/source/concepts/llm_provider.rst
+++ b/docs/source/concepts/llm_provider.rst
@@ -32,6 +32,32 @@ calls, handling retries, managing rate limits, and ensuring seamless integration
 LLMs. Simply configure the details of the LLMs your application will use, and Arch offers a unified interface to
 make outbound LLM calls.
 
+Adding custom LLM Provider
+--------------------------
+
+We support any OpenAI compliant LLM for example mistral, openai, ollama etc. We offer first class support for openai and ollama. You can easily configure an LLM that communicates over the OpenAI API interface, by following the below guide.
+
+For example following code block shows you how to add an ollama-supported LLM in the `arch_config.yaml` file.
+
+.. code-block:: yaml
+
+    - name: local-llama
+      provider_interface: openai
+      model: llama3.2
+      endpoint: host.docker.internal:11434
+
+
+For example following code block shows you how to add mistral llm provider in the `arch_config.yaml` file.
+
+.. code-block:: yaml
+
+    - name: mistral-ai
+      provider_interface: openai
+      model: ministral-3b-latest
+      endpoint: api.mistral.ai:443
+      protocol: https
+
+
 Example: Using the OpenAI Python SDK
 ------------------------------------
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index db84f3ec..be9db942 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -15,7 +15,7 @@ from sphinxawesome_theme.postprocess import Icons
 project = "Arch Docs"
 copyright = "2025, Katanemo Labs, Inc"
 author = "Katanemo Labs, Inc"
-release = " v0.1.9"
+release = " v0.2.0"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/docs/source/get_started/quickstart.rst b/docs/source/get_started/quickstart.rst
index aa4deae2..5363f817 100644
--- a/docs/source/get_started/quickstart.rst
+++ b/docs/source/get_started/quickstart.rst
@@ -25,7 +25,7 @@ Arch's CLI allows you to manage and interact with the Arch gateway efficiently.
 
    $ python -m venv venv
    $ source venv/bin/activate   # On Windows, use: venv\Scripts\activate
-   $ pip install archgw==0.1.9
+   $ pip install archgw==0.2.0
 
 
 Build AI Agent with Arch Gateway
diff --git a/docs/source/guides/includes/arch_config.yaml b/docs/source/guides/includes/arch_config.yaml
index 73fdff00..415c74aa 100644
--- a/docs/source/guides/includes/arch_config.yaml
+++ b/docs/source/guides/includes/arch_config.yaml
@@ -9,7 +9,7 @@ listener:
 # Centralized way to manage LLMs, manage keys, retry logic, failover and limits in a central way
 llm_providers:
   - name: OpenAI
-    provider: openai
+    provider_interface: openai
     access_key: $OPENAI_API_KEY
     model: gpt-4o
     default: true
diff --git a/model_server/pyproject.toml b/model_server/pyproject.toml
index a7ee92ee..e9b2dc0e 100644
--- a/model_server/pyproject.toml
+++ b/model_server/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "archgw_modelserver"
-version = "0.1.9"
+version = "0.2.0"
 description = "A model server for serving models"
 authors = ["Katanemo Labs, Inc <info@katanemo.com>"]
 license = "Apache 2.0"
diff --git a/tests/archgw/arch_config.yaml b/tests/archgw/arch_config.yaml
index 3f450717..2c3d85d5 100644
--- a/tests/archgw/arch_config.yaml
+++ b/tests/archgw/arch_config.yaml
@@ -14,18 +14,18 @@ endpoints:
 llm_providers:
   - name: gpt-4o-mini
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o-mini
     default: true
 
   - name: gpt-3.5-turbo-0125
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-3.5-turbo-0125
 
   - name: gpt-4o
     access_key: $OPENAI_API_KEY
-    provider: openai
+    provider_interface: openai
     model: gpt-4o
 
 system_prompt: |