diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py
index 2321c8f2f..132aef7e5 100644
--- a/llama_stack/cli/stack/build.py
+++ b/llama_stack/cli/stack/build.py
@@ -95,9 +95,9 @@ class StackBuild(Subcommand):
         # save build.yaml spec for building same distribution again
         if build_config.image_type == ImageType.docker.value:
             # docker needs build file to be in the llama-stack repo dir to be able to copy over to the image
-            llama_stack_path = Path(os.path.relpath(__file__)).parent.parent.parent
+            llama_stack_path = Path(os.path.abspath(__file__)).parent.parent.parent.parent
             build_dir = (
-                llama_stack_path / "configs/distributions" / build_config.image_type
+                llama_stack_path / "tmp/configs/"
             )
         else:
             build_dir = (
diff --git a/llama_stack/distribution/build_container.sh b/llama_stack/distribution/build_container.sh
index 3efef6c97..fec1e394f 100755
--- a/llama_stack/distribution/build_container.sh
+++ b/llama_stack/distribution/build_container.sh
@@ -103,7 +103,7 @@ add_to_docker <<EOF
 
 EOF
 
-add_to_docker "ADD $build_file_path ./llamastack-build.yaml"
+add_to_docker "ADD tmp/configs/$(basename "$build_file_path") ./llamastack-build.yaml"
 
 printf "Dockerfile created successfully in $TEMP_DIR/Dockerfile"
 cat $TEMP_DIR/Dockerfile
@@ -116,6 +116,7 @@ fi
 if [ -n "$LLAMA_MODELS_DIR" ]; then
   mounts="$mounts -v $(readlink -f $LLAMA_MODELS_DIR):$models_mount"
 fi
+
 set -x
 $DOCKER_BINARY build $DOCKER_OPTS -t $image_name -f "$TEMP_DIR/Dockerfile" "$REPO_DIR" $mounts
 set +x