diff --git a/llama_stack/templates/cerebras/report.md b/llama_stack/templates/cerebras/report.md
index c65cd4979..7c09474b1 100644
--- a/llama_stack/templates/cerebras/report.md
+++ b/llama_stack/templates/cerebras/report.md
@@ -1,6 +1,6 @@
 # Report for cerebras distribution
 
-## Supported Models:
+## Supported Models
 | Model Descriptor | cerebras |
 |:---|:---|
 | meta-llama/Llama-3-8B-Instruct | ❌ |
@@ -18,7 +18,7 @@
 | meta-llama/Llama-Guard-3-8B | ❌ |
 | meta-llama/Llama-Guard-2-8B | ❌ |
 
-## Inference:
+## Inference
 | Model | API | Capability | Test | Status |
 |:----- |:-----|:-----|:-----|:-----|
 | Llama-3.1-8B-Instruct | /chat_completion | streaming | test_text_chat_completion_streaming | ✅ |
@@ -31,12 +31,12 @@
 | Llama-3.1-8B-Instruct | /completion | non_streaming | test_text_completion_non_streaming | ✅ |
 | Llama-3.1-8B-Instruct | /completion | structured_output | test_text_completion_structured_output | ❌ |
 
-## Vector_io:
+## Vector IO
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /retrieve |  | test_vector_db_retrieve | ✅ |
 
-## Agents:
+## Agents
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /create_agent_turn | rag | test_rag_agent | ✅ |
diff --git a/llama_stack/templates/fireworks/remote-hosted-report.md b/llama_stack/templates/fireworks/remote-hosted-report.md
index fb338ba13..2f3c882b7 100644
--- a/llama_stack/templates/fireworks/remote-hosted-report.md
+++ b/llama_stack/templates/fireworks/remote-hosted-report.md
@@ -1,6 +1,6 @@
 # Report for fireworks distribution
 
-## Supported Models:
+## Supported Models
 | Model Descriptor | fireworks |
 |:---|:---|
 | meta-llama/Llama-3-8B-Instruct | ❌ |
@@ -18,7 +18,7 @@
 | meta-llama/Llama-Guard-3-8B | ❌ |
 | meta-llama/Llama-Guard-2-8B | ❌ |
 
-## Inference:
+## Inference
 | Model | API | Capability | Test | Status |
 |:----- |:-----|:-----|:-----|:-----|
 | Text | /chat_completion | streaming | test_text_chat_completion_streaming | ❌ |
@@ -37,7 +37,7 @@
 | /insert, /query | inline | test_memory_bank_insert_inline_and_query | ❌ |
 | /insert, /query | url | test_memory_bank_insert_from_url_and_query | ❌ |
 
-## Agents:
+## Agents
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | create_agent_turn | rag | test_rag_agent | ❌ |
diff --git a/llama_stack/templates/fireworks/report.md b/llama_stack/templates/fireworks/report.md
index 1c5550bf4..00e8f6a55 100644
--- a/llama_stack/templates/fireworks/report.md
+++ b/llama_stack/templates/fireworks/report.md
@@ -1,6 +1,6 @@
 # Report for fireworks distribution
 
-## Supported Models:
+## Supported Models
 | Model Descriptor | fireworks |
 |:---|:---|
 | Llama-3-8B-Instruct | ❌ |
@@ -18,7 +18,7 @@
 | Llama-Guard-3-8B | ✅ |
 | Llama-Guard-2-8B | ❌ |
 
-## Inference:
+## Inference
 | Model | API | Capability | Test | Status |
 |:----- |:-----|:-----|:-----|:-----|
 | Llama-3.1-8B-Instruct | /chat_completion | streaming | test_text_chat_completion_streaming | ✅ |
@@ -31,12 +31,12 @@
 | Llama-3.1-8B-Instruct | /completion | non_streaming | test_text_completion_non_streaming | ✅ |
 | Llama-3.1-8B-Instruct | /completion | structured_output | test_text_completion_structured_output | ✅ |
 
-## Vector_io:
+## Vector IO
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /retrieve |  | test_vector_db_retrieve | ✅ |
 
-## Agents:
+## Agents
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /create_agent_turn | rag | test_rag_agent | ✅ |
diff --git a/llama_stack/templates/ollama/report.md b/llama_stack/templates/ollama/report.md
index 0d370b8ec..724809a59 100644
--- a/llama_stack/templates/ollama/report.md
+++ b/llama_stack/templates/ollama/report.md
@@ -1,6 +1,6 @@
 # Report for ollama distribution
 
-## Supported Models:
+## Supported Models
 | Model Descriptor | ollama |
 |:---|:---|
 | Llama-3-8B-Instruct | ❌ |
@@ -18,7 +18,7 @@
 | Llama-Guard-3-8B | ✅ |
 | Llama-Guard-2-8B | ❌ |
 
-## Inference:
+## Inference
 | Model | API | Capability | Test | Status |
 |:----- |:-----|:-----|:-----|:-----|
 | Llama-3.1-8B-Instruct | /chat_completion | streaming | test_text_chat_completion_streaming | ✅ |
@@ -31,12 +31,12 @@
 | Llama-3.1-8B-Instruct | /completion | non_streaming | test_text_completion_non_streaming | ✅ |
 | Llama-3.1-8B-Instruct | /completion | structured_output | test_text_completion_structured_output | ✅ |
 
-## Vector_io:
+## Vector IO
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /retrieve |  | test_vector_db_retrieve | ✅ |
 
-## Agents:
+## Agents
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /create_agent_turn | rag | test_rag_agent | ✅ |
diff --git a/llama_stack/templates/tgi/report.md b/llama_stack/templates/tgi/report.md
index 1f76ff692..b0f5d88a2 100644
--- a/llama_stack/templates/tgi/report.md
+++ b/llama_stack/templates/tgi/report.md
@@ -1,6 +1,6 @@
 # Report for tgi distribution
 
-## Supported Models:
+## Supported Models
 | Model Descriptor | tgi |
 |:---|:---|
 | Llama-3-8B-Instruct | ✅ |
@@ -18,7 +18,7 @@
 | Llama-Guard-3-8B | ✅ |
 | Llama-Guard-2-8B | ✅ |
 
-## Inference:
+## Inference
 | Model | API | Capability | Test | Status |
 |:----- |:-----|:-----|:-----|:-----|
 | Llama-3.1-8B-Instruct | /chat_completion | streaming | test_text_chat_completion_streaming | ✅ |
@@ -31,12 +31,12 @@
 | Llama-3.1-8B-Instruct | /completion | non_streaming | test_text_completion_non_streaming | ✅ |
 | Llama-3.1-8B-Instruct | /completion | structured_output | test_text_completion_structured_output | ✅ |
 
-## Vector_io:
+## Vector IO
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /retrieve |  | test_vector_db_retrieve | ✅ |
 
-## Agents:
+## Agents
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /create_agent_turn | rag | test_rag_agent | ✅ |
diff --git a/llama_stack/templates/together/report.md b/llama_stack/templates/together/report.md
index 10891f4e5..b5339c640 100644
--- a/llama_stack/templates/together/report.md
+++ b/llama_stack/templates/together/report.md
@@ -1,6 +1,6 @@
 # Report for together distribution
 
-## Supported Models:
+## Supported Models
 | Model Descriptor | together |
 |:---|:---|
 | Llama-3-8B-Instruct | ❌ |
@@ -18,7 +18,7 @@
 | Llama-Guard-3-8B | ✅ |
 | Llama-Guard-2-8B | ❌ |
 
-## Inference:
+## Inference
 | Model | API | Capability | Test | Status |
 |:----- |:-----|:-----|:-----|:-----|
 | Llama-3.1-8B-Instruct | /chat_completion | streaming | test_text_chat_completion_streaming | ✅ |
@@ -31,12 +31,12 @@
 | Llama-3.1-8B-Instruct | /completion | non_streaming | test_text_completion_non_streaming | ✅ |
 | Llama-3.1-8B-Instruct | /completion | structured_output | test_text_completion_structured_output | ✅ |
 
-## Vector_io:
+## Vector IO
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /retrieve |  | test_vector_db_retrieve | ✅ |
 
-## Agents:
+## Agents
 | API | Capability | Test | Status |
 |:-----|:-----|:-----|:-----|
 | /create_agent_turn | rag | test_rag_agent | ✅ |