diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py
index 56d0151f3..8c65d7c5f 100644
--- a/llama_stack/cli/stack/build.py
+++ b/llama_stack/cli/stack/build.py
@@ -9,9 +9,12 @@ import argparse
 from llama_stack.cli.subcommand import Subcommand
 from llama_stack.distribution.datatypes import *  # noqa: F403
 import os
+import shutil
 from functools import lru_cache
 from pathlib import Path
 
+import pkg_resources
+
 from llama_stack.distribution.distribution import get_provider_registry
 from llama_stack.distribution.utils.dynamic import instantiate_class_type
 
@@ -99,7 +102,9 @@ class StackBuild(Subcommand):
                         self.parser.error(
                             f"Please specify a image-type (docker | conda) for {args.template}"
                         )
-                    self._run_stack_build_command_from_build_config(build_config)
+                    self._run_stack_build_command_from_build_config(
+                        build_config, template_name=args.template
+                    )
                     return
 
             self.parser.error(
@@ -248,12 +253,13 @@ class StackBuild(Subcommand):
         )
 
     def _run_stack_build_command_from_build_config(
-        self, build_config: BuildConfig
+        self, build_config: BuildConfig, template_name: Optional[str] = None
     ) -> None:
         import json
         import os
 
         import yaml
+        from termcolor import cprint
 
         from llama_stack.distribution.build import build_image
         from llama_stack.distribution.utils.config_dirs import DISTRIBS_BASE_DIR
@@ -271,7 +277,20 @@ class StackBuild(Subcommand):
         if return_code != 0:
             return
 
-        self._generate_run_config(build_config, build_dir)
+        if template_name:
+            # copy run.yaml from template to build_dir instead of generating it again
+            template_path = pkg_resources.resource_filename(
+                "llama_stack", f"templates/{template_name}/run.yaml"
+            )
+            os.makedirs(build_dir, exist_ok=True)
+            run_config_file = build_dir / f"{build_config.name}-run.yaml"
+            shutil.copy(template_path, run_config_file)
+            cprint(
+                f"You can now edit {run_config_file} and run `llama stack run {run_config_file}`",
+                color="green",
+            )
+        else:
+            self._generate_run_config(build_config, build_dir)
 
     def _run_template_list_cmd(self, args: argparse.Namespace) -> None:
         import json