diff --git a/.workshop/docs/steps/06-skills.md b/.workshop/docs/steps/06-skills.md
index d8caa24..fa9c998 100644
--- a/.workshop/docs/steps/06-skills.md
+++ b/.workshop/docs/steps/06-skills.md
@@ -265,7 +265,17 @@ Add the local skill to the manifest metadata: a `travel-guide` entry under `tool
 ```yaml
 # travel_assistant/agent.manifest.yaml (delta)
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
   tool_declarations:
     # ... the Step 5 declarations stay ...
     - name: travel-guide
@@ -273,6 +283,7 @@ metadata:
         Local Skill that renders a grounded, downloadable PDF travel guide (with a
         day-by-day itinerary) via scripts/create_travel_guide.py.
       type: skill
+# ... the template block (name, kind, protocols, environment_variables) stays ...
 resources: []
 ```
 
@@ -533,7 +544,18 @@ In the manifest, append the `Foundry Skills` tag, add a `response-guardrails` `t
 ```yaml
 # travel_assistant/agent.manifest.yaml (delta)
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Foundry Skills]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Foundry Skills
   tool_declarations:
     # ... the Step 5 declarations + local `travel-guide` skill stay ...
     - name: response-guardrails
diff --git a/.workshop/docs/steps/07-multi-agent.md b/.workshop/docs/steps/07-multi-agent.md
index 6de8c01..6a1fbbf 100644
--- a/.workshop/docs/steps/07-multi-agent.md
+++ b/.workshop/docs/steps/07-multi-agent.md
@@ -138,7 +138,18 @@ Metadata-only: append the `Multi-Agent` tag to your existing `tags` (if you kept
 ```yaml
 # travel_assistant/agent.manifest.yaml (delta)
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Multi-Agent]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Multi-Agent
   group_chat:
     manager: Coordinator
     specialists: [FlightsSpecialist, HotelsSpecialist, ActivitiesSpecialist]
diff --git a/.workshop/docs/steps/08-workflow.md b/.workshop/docs/steps/08-workflow.md
index 3e2184a..cf52f72 100644
--- a/.workshop/docs/steps/08-workflow.md
+++ b/.workshop/docs/steps/08-workflow.md
@@ -237,7 +237,19 @@ Metadata-only: append the `Workflows` tag, update the `description`, and add a `
 ```yaml
 # travel_assistant/agent.manifest.yaml (delta)
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Multi-Agent, Workflows]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Multi-Agent
+    - Workflows
   workflow:
     start: gather_preferences
     executors: [gather_preferences, flights, hotels, activities, consolidate, finalize_itinerary]
diff --git a/.workshop/docs/steps/09-memory.md b/.workshop/docs/steps/09-memory.md
index cb1ca8f..8d24e9b 100644
--- a/.workshop/docs/steps/09-memory.md
+++ b/.workshop/docs/steps/09-memory.md
@@ -172,7 +172,20 @@ In `agent.manifest.yaml`, append the `Memory` tag, add a memory `tool_declaratio
 ```yaml
 # travel_assistant/agent.manifest.yaml (delta)
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Multi-Agent, Workflows, Memory]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Multi-Agent
+    - Workflows
+    - Memory
   tool_declarations:
     - name: travelbuddy_memory
       description: Durable, per-user memory backed by a Foundry Memory Store, scoped via {{$userId}}.
diff --git a/.workshop/solutions/06-skills/travel_assistant/agent.manifest.yaml b/.workshop/solutions/06-skills/travel_assistant/agent.manifest.yaml
index 6e9b0bd..8bd8015 100644
--- a/.workshop/solutions/06-skills/travel_assistant/agent.manifest.yaml
+++ b/.workshop/solutions/06-skills/travel_assistant/agent.manifest.yaml
@@ -16,7 +16,18 @@ description: >
   prompt + script, and a Foundry response-guardrails Skill downloaded from the
   project and shareable across agents.
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Foundry Skills]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Foundry Skills
   tool_declarations:
     - name: get_weather
       description: Returns mock destination weather for a city and optional date.
diff --git a/.workshop/solutions/07-multi-agent/travel_assistant/agent.manifest.yaml b/.workshop/solutions/07-multi-agent/travel_assistant/agent.manifest.yaml
index 488a2aa..f73d0f3 100644
--- a/.workshop/solutions/07-multi-agent/travel_assistant/agent.manifest.yaml
+++ b/.workshop/solutions/07-multi-agent/travel_assistant/agent.manifest.yaml
@@ -17,7 +17,19 @@ description: >
   response-guardrails Skill (downloaded from the project and shareable across agents) — sliced
   per role.
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Foundry Skills, Multi-Agent]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Foundry Skills
+    - Multi-Agent
   tool_declarations:
     - name: get_weather
       description: Returns mock destination weather for a city and optional date.
diff --git a/.workshop/solutions/08-workflow/travel_assistant/agent.manifest.yaml b/.workshop/solutions/08-workflow/travel_assistant/agent.manifest.yaml
index 388e3c1..377c431 100644
--- a/.workshop/solutions/08-workflow/travel_assistant/agent.manifest.yaml
+++ b/.workshop/solutions/08-workflow/travel_assistant/agent.manifest.yaml
@@ -14,7 +14,20 @@ description: >
   hosted as one agent via workflow.as_agent(); an optional human-approval gate uses
   the request/response (request_info) pattern.
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Foundry Skills, Multi-Agent, Workflows]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Foundry Skills
+    - Multi-Agent
+    - Workflows
   tool_declarations:
     - name: get_weather
       description: Returns mock destination weather for a city and optional date.
diff --git a/.workshop/solutions/09-memory/travel_assistant/agent.manifest.yaml b/.workshop/solutions/09-memory/travel_assistant/agent.manifest.yaml
index ed4c138..84f181e 100644
--- a/.workshop/solutions/09-memory/travel_assistant/agent.manifest.yaml
+++ b/.workshop/solutions/09-memory/travel_assistant/agent.manifest.yaml
@@ -16,7 +16,21 @@ description: >
   FoundryMemoryProvider, so durable per-user preferences are recalled and updated
   across conversations.
 metadata:
-  tags: [Agent Framework, AI Agent Hosting, Azure AI AgentServer, Responses Protocol, Travel Assistant, Function Tools, MCP Tools, Toolbox Tools, RAG, Skills, Foundry Skills, Multi-Agent, Workflows, Memory]
+  tags:
+    - Agent Framework
+    - AI Agent Hosting
+    - Azure AI AgentServer
+    - Responses Protocol
+    - Travel Assistant
+    - Function Tools
+    - MCP Tools
+    - Toolbox Tools
+    - RAG
+    - Skills
+    - Foundry Skills
+    - Multi-Agent
+    - Workflows
+    - Memory
   tool_declarations:
     - name: get_weather
       description: Returns mock destination weather for a city and optional date.