diff --git a/llama_stack/distribution/build.py b/llama_stack/distribution/build.py
index dabcad2a6..b616fcf6d 100644
--- a/llama_stack/distribution/build.py
+++ b/llama_stack/distribution/build.py
@@ -8,16 +8,17 @@ from enum import Enum
 from typing import List, Optional
 
 import pkg_resources
+
+from llama_stack.distribution.utils.exec import run_with_pty
 from pydantic import BaseModel
 
 from termcolor import cprint
 
-from llama_stack.distribution.utils.exec import run_with_pty
-
 from llama_stack.distribution.datatypes import *  # noqa: F403
 from pathlib import Path
 
 from llama_stack.distribution.distribution import api_providers, SERVER_DEPENDENCIES
+from llama_stack.distribution.utils.config_dirs import BUILDS_BASE_DIR
 
 
 class ImageType(Enum):
@@ -85,6 +86,7 @@ def build_image(build_config: BuildConfig, build_file_path: Path):
             build_config.name,
             package_deps.docker_image,
             str(build_file_path),
+            str(BUILDS_BASE_DIR / ImageType.docker.value),
             " ".join(deps),
         ]
     else:
diff --git a/llama_stack/distribution/build_container.sh b/llama_stack/distribution/build_container.sh
index 625c8cfc3..33fea5566 100755
--- a/llama_stack/distribution/build_container.sh
+++ b/llama_stack/distribution/build_container.sh
@@ -18,7 +18,8 @@ build_name="$1"
 image_name="llamastack-$build_name"
 docker_base=$2
 build_file_path=$3
-pip_dependencies=$4
+host_build_dir=$4
+pip_dependencies=$5
 
 # Define color codes
 RED='\033[0;31m'
@@ -134,4 +135,6 @@ set -x
 $DOCKER_BINARY build $DOCKER_OPTS -t $image_name -f "$TEMP_DIR/Dockerfile" "$REPO_DIR" $mounts
 set +x
 
+mv $REPO_CONFIGS_DIR/$build_name-run.yaml $host_build_dir
+
 echo "Success! You can run it with: $DOCKER_BINARY $DOCKER_OPTS run -p 5000:5000 $image_name"