diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py
index bbf089326..5e32af494 100644
--- a/llama_stack/cli/stack/build.py
+++ b/llama_stack/cli/stack/build.py
@@ -133,7 +133,7 @@ class StackBuild(Subcommand):
 
         # eventually, this should query a registry at llama.meta.com/llamastack/distributions
         headers = [
-            "Distribution Type",
+            "Template Name",
             "Providers",
             "Image Type",
             "Description",
diff --git a/llama_stack/distribution/templates/local-conda-template-build.yaml b/llama_stack/distribution/templates/local-conda-build.yaml
similarity index 90%
rename from llama_stack/distribution/templates/local-conda-template-build.yaml
rename to llama_stack/distribution/templates/local-conda-build.yaml
index cc3a84bc2..ba541502e 100644
--- a/llama_stack/distribution/templates/local-conda-template-build.yaml
+++ b/llama_stack/distribution/templates/local-conda-build.yaml
@@ -1,4 +1,4 @@
-name: local-conda-template
+name: local-conda
 distribution_spec:
   description: Use code from `llama_stack` itself to serve all llama stack APIs
   providers:
diff --git a/llama_stack/distribution/templates/local-docker-template-build.yaml b/llama_stack/distribution/templates/local-docker-build.yaml
similarity index 90%
rename from llama_stack/distribution/templates/local-docker-template-build.yaml
rename to llama_stack/distribution/templates/local-docker-build.yaml
index c7d5892b8..ebccd2cf2 100644
--- a/llama_stack/distribution/templates/local-docker-template-build.yaml
+++ b/llama_stack/distribution/templates/local-docker-build.yaml
@@ -1,4 +1,4 @@
-name: local-docker-template
+name: local-docker
 distribution_spec:
   description: Use code from `llama_stack` itself to serve all llama stack APIs
   providers:
diff --git a/llama_stack/distribution/templates/local-fireworks-conda-template-build.yaml b/llama_stack/distribution/templates/local-fireworks-conda-build.yaml
similarity index 87%
rename from llama_stack/distribution/templates/local-fireworks-conda-template-build.yaml
rename to llama_stack/distribution/templates/local-fireworks-conda-build.yaml
index 9f0041453..9c4ff0bb4 100644
--- a/llama_stack/distribution/templates/local-fireworks-conda-template-build.yaml
+++ b/llama_stack/distribution/templates/local-fireworks-conda-build.yaml
@@ -1,4 +1,4 @@
-name: local-fireworks-conda-template
+name: local-fireworks-conda
 distribution_spec:
   description: Use Fireworks.ai for running LLM inference
   providers:
diff --git a/llama_stack/distribution/templates/local-ollama-conda-template-build.yaml b/llama_stack/distribution/templates/local-ollama-conda-build.yaml
similarity index 88%
rename from llama_stack/distribution/templates/local-ollama-conda-template-build.yaml
rename to llama_stack/distribution/templates/local-ollama-conda-build.yaml
index e9ef59904..0d27e4d6b 100644
--- a/llama_stack/distribution/templates/local-ollama-conda-template-build.yaml
+++ b/llama_stack/distribution/templates/local-ollama-conda-build.yaml
@@ -1,4 +1,4 @@
-name: local-ollama-conda-template
+name: local-ollama-conda
 distribution_spec:
   description: Like local, but use ollama for running LLM inference
   providers:
diff --git a/llama_stack/distribution/templates/local-tgi-conda-template-build.yaml b/llama_stack/distribution/templates/local-tgi-conda-build.yaml
similarity index 92%
rename from llama_stack/distribution/templates/local-tgi-conda-template-build.yaml
rename to llama_stack/distribution/templates/local-tgi-conda-build.yaml
index 8d7420186..9a6fce105 100644
--- a/llama_stack/distribution/templates/local-tgi-conda-template-build.yaml
+++ b/llama_stack/distribution/templates/local-tgi-conda-build.yaml
@@ -1,4 +1,4 @@
-name: local-tgi-conda-template
+name: local-tgi-conda
 distribution_spec:
   description: Use TGI (local or with Hugging Face Inference Endpoints for running LLM inference. When using HF Inference Endpoints, you must provide the name of the endpoint).
   providers:
diff --git a/llama_stack/distribution/templates/local-together-conda-template-build.yaml b/llama_stack/distribution/templates/local-together-conda-build.yaml
similarity index 88%
rename from llama_stack/distribution/templates/local-together-conda-template-build.yaml
rename to llama_stack/distribution/templates/local-together-conda-build.yaml
index a812c1b01..8cf867971 100644
--- a/llama_stack/distribution/templates/local-together-conda-template-build.yaml
+++ b/llama_stack/distribution/templates/local-together-conda-build.yaml
@@ -1,4 +1,4 @@
-name: local-tgi-conda-template
+name: local-tgi-conda
 distribution_spec:
   description: Use Together.ai for running LLM inference
   providers: