diff --git a/distributions/dell-tgi/run.yaml b/distributions/dell-tgi/run.yaml
index 5243f4e69..4b7b331fe 100644
--- a/distributions/dell-tgi/run.yaml
+++ b/distributions/dell-tgi/run.yaml
@@ -29,7 +29,7 @@ providers:
       model: Prompt-Guard-86M
   memory:
   - provider_id: meta0
-    provider_type: inline::meta-reference
+    provider_type: inline::faiss
     config: {}
   agents:
   - provider_id: meta0
diff --git a/llama_stack/templates/bedrock/build.yaml b/llama_stack/templates/bedrock/build.yaml
index 44cc813ae..c87762043 100644
--- a/llama_stack/templates/bedrock/build.yaml
+++ b/llama_stack/templates/bedrock/build.yaml
@@ -5,5 +5,5 @@ distribution_spec:
     inference: remote::bedrock
     memory: inline::faiss
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/fireworks/build.yaml b/llama_stack/templates/fireworks/build.yaml
index 833ce4ee2..ffd67738d 100644
--- a/llama_stack/templates/fireworks/build.yaml
+++ b/llama_stack/templates/fireworks/build.yaml
@@ -4,8 +4,8 @@ distribution_spec:
   providers:
     inference: remote::fireworks
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::weaviate
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/hf-endpoint/build.yaml b/llama_stack/templates/hf-endpoint/build.yaml
index b06ee2eb0..61fd12a2c 100644
--- a/llama_stack/templates/hf-endpoint/build.yaml
+++ b/llama_stack/templates/hf-endpoint/build.yaml
@@ -5,5 +5,5 @@ distribution_spec:
     inference: remote::hf::endpoint
     memory: inline::faiss
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/hf-serverless/build.yaml b/llama_stack/templates/hf-serverless/build.yaml
index 62ff2c953..065a14517 100644
--- a/llama_stack/templates/hf-serverless/build.yaml
+++ b/llama_stack/templates/hf-serverless/build.yaml
@@ -5,5 +5,5 @@ distribution_spec:
     inference: remote::hf::serverless
     memory: inline::faiss
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/inline-vllm/build.yaml b/llama_stack/templates/inline-vllm/build.yaml
index 2e4b34bc6..61d9e4db8 100644
--- a/llama_stack/templates/inline-vllm/build.yaml
+++ b/llama_stack/templates/inline-vllm/build.yaml
@@ -3,11 +3,11 @@ distribution_spec:
   docker_image: pytorch/pytorch:2.5.0-cuda12.4-cudnn9-runtime
   description: Use code from `llama_stack` itself to serve all llama stack APIs
   providers:
-    inference: meta-reference
+    inference: inline::meta-reference
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::chromadb
     - remote::pgvector
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/meta-reference-gpu/build.yaml b/llama_stack/templates/meta-reference-gpu/build.yaml
index 2e4b34bc6..7c468e41c 100644
--- a/llama_stack/templates/meta-reference-gpu/build.yaml
+++ b/llama_stack/templates/meta-reference-gpu/build.yaml
@@ -5,9 +5,9 @@ distribution_spec:
   providers:
     inference: meta-reference
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::chromadb
     - remote::pgvector
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/meta-reference-quantized-gpu/build.yaml b/llama_stack/templates/meta-reference-quantized-gpu/build.yaml
index 8768bd430..a22490b5e 100644
--- a/llama_stack/templates/meta-reference-quantized-gpu/build.yaml
+++ b/llama_stack/templates/meta-reference-quantized-gpu/build.yaml
@@ -5,9 +5,9 @@ distribution_spec:
   providers:
     inference: meta-reference-quantized
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::chromadb
     - remote::pgvector
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/ollama/build.yaml b/llama_stack/templates/ollama/build.yaml
index 410ae37cd..8cab877ea 100644
--- a/llama_stack/templates/ollama/build.yaml
+++ b/llama_stack/templates/ollama/build.yaml
@@ -4,9 +4,9 @@ distribution_spec:
   providers:
     inference: remote::ollama
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::chromadb
     - remote::pgvector
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/remote-vllm/build.yaml b/llama_stack/templates/remote-vllm/build.yaml
index 967b64413..39abb10af 100644
--- a/llama_stack/templates/remote-vllm/build.yaml
+++ b/llama_stack/templates/remote-vllm/build.yaml
@@ -4,9 +4,9 @@ distribution_spec:
   providers:
     inference: remote::vllm
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::chromadb
     - remote::pgvector
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/tgi/build.yaml b/llama_stack/templates/tgi/build.yaml
index 70c860001..5500361c4 100644
--- a/llama_stack/templates/tgi/build.yaml
+++ b/llama_stack/templates/tgi/build.yaml
@@ -4,9 +4,9 @@ distribution_spec:
   providers:
     inference: remote::tgi
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::chromadb
     - remote::pgvector
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference
diff --git a/llama_stack/templates/together/build.yaml b/llama_stack/templates/together/build.yaml
index 614e31093..5c149272d 100644
--- a/llama_stack/templates/together/build.yaml
+++ b/llama_stack/templates/together/build.yaml
@@ -4,8 +4,8 @@ distribution_spec:
   providers:
     inference: remote::together
     memory:
-    - meta-reference
+    - inline::faiss
     - remote::weaviate
     safety: inline::llama-guard
-    agents: meta-reference
-    telemetry: meta-reference
+    agents: inline::meta-reference
+    telemetry: inline::meta-reference