diff --git a/.github/workflows/publish-to-docker.yml b/.github/workflows/publish-to-docker.yml
new file mode 100644
index 000000000..cf1e8b916
--- /dev/null
+++ b/.github/workflows/publish-to-docker.yml
@@ -0,0 +1,99 @@
+name: Docker Build and Publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'TestPyPI or PyPI version to build (e.g., 0.0.63.dev20250114)'
+        required: true
+        type: string
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set version
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" = "push" ]; then
+            echo "VERSION=0.0.63.dev20250114" >> $GITHUB_OUTPUT
+          else
+            echo "VERSION=${{ inputs.version }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check package version availability
+        run: |
+            # Function to check if version exists in a repository
+            check_version() {
+                local repo=$1
+                local status_code=$(curl -s -o /dev/null -w "%{http_code}" "https://$repo.org/project/llama-stack/${{ steps.version.outputs.version }}")
+                return $([ "$status_code" -eq 200 ])
+            }
+
+            # Check TestPyPI first, then PyPI
+            if check_version "test.pypi"; then
+                echo "Version ${{ steps.version.outputs.version }} found in TestPyPI"
+                echo "PYPI_SOURCE=testpypi" >> $GITHUB_ENV
+            elif check_version "pypi"; then
+                echo "Version ${{ steps.version.outputs.version }} found in PyPI"
+                echo "PYPI_SOURCE=pypi" >> $GITHUB_ENV
+            else
+                echo "Error: Version ${{ steps.version.outputs.version }} not found in either TestPyPI or PyPI"
+                exit 1
+            fi
+
+      - name: Install llama-stack
+        run: |
+            if [ "${{ github.event_name }}" = "push" ]; then
+                pip install -e .
+            else
+                if [ "$PYPI_SOURCE" = "testpypi" ]; then
+                    pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple llama-stack==${{ steps.version.outputs.version }}
+                else
+                    pip install llama-stack==${{ steps.version.outputs.version }}
+                fi
+            fi
+
+      - name: Build docker image
+        run: |
+          TEMPLATES=("ollama" "bedrock" "remote-vllm" "fireworks" "together" "tgi" "meta-reference-gpu")
+          for template in "${TEMPLATES[@]}"; do
+            if [ "$PYPI_SOURCE" = "testpypi" ]; then
+                TEST_PYPI_VERSION=${{ steps.version.outputs.version }} llama stack build --template $template --image-type docker
+            else
+                PYPI_VERSION=${{ steps.version.outputs.version }} llama stack build --template $template --image-type docker
+            fi
+          done
+
+      - name: List docker images
+        run: |
+          docker images
+
+      - name: Push to dockerhub
+        run: |
+          TEMPLATES=("ollama" "bedrock" "remote-vllm" "fireworks" "together" "tgi" "meta-reference-gpu")
+          for template in "${TEMPLATES[@]}"; do
+            if [ "$PYPI_SOURCE" = "testpypi" ]; then
+                docker tag distribution-$template:test-${{ steps.version.outputs.version }} llamastack/distribution-$template:test-${{ steps.version.outputs.version }}
+                docker push llamastack/distribution-$template:test-${{ steps.version.outputs.version }}
+            else
+                docker tag distribution-$template:${{ steps.version.outputs.version }} llamastack/distribution-$template:${{ steps.version.outputs.version }}
+                docker push llamastack/distribution-$template:${{ steps.version.outputs.version }}
+            fi
+          done
diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py
index 85e6cb962..38994bebf 100644
--- a/llama_stack/cli/stack/build.py
+++ b/llama_stack/cli/stack/build.py
@@ -107,7 +107,8 @@ class StackBuild(Subcommand):
                             f"Please specify a image-type (docker | conda | venv) for {args.template}"
                         )
                     self._run_stack_build_command_from_build_config(
-                        build_config, template_name=args.template
+                        build_config,
+                        template_name=args.template,
                     )
                     return
 
@@ -261,7 +262,9 @@ class StackBuild(Subcommand):
         )
 
     def _run_stack_build_command_from_build_config(
-        self, build_config: BuildConfig, template_name: Optional[str] = None
+        self,
+        build_config: BuildConfig,
+        template_name: Optional[str] = None,
     ) -> None:
         import json
         import os
diff --git a/llama_stack/distribution/build.py b/llama_stack/distribution/build.py
index 5a7dfba11..a8b2342af 100644
--- a/llama_stack/distribution/build.py
+++ b/llama_stack/distribution/build.py
@@ -6,6 +6,7 @@
 
 import importlib.resources
 import logging
+import sys
 from enum import Enum
 
 from pathlib import Path
@@ -20,7 +21,7 @@ from llama_stack.distribution.distribution import get_provider_registry
 
 from llama_stack.distribution.utils.config_dirs import BUILDS_BASE_DIR
 
-from llama_stack.distribution.utils.exec import run_with_pty
+from llama_stack.distribution.utils.exec import run_command, run_with_pty
 from llama_stack.providers.datatypes import Api
 
 log = logging.getLogger(__name__)
@@ -102,7 +103,10 @@ def print_pip_install_help(providers: Dict[str, List[Provider]]):
     print()
 
 
-def build_image(build_config: BuildConfig, build_file_path: Path):
+def build_image(
+    build_config: BuildConfig,
+    build_file_path: Path,
+):
     docker_image = build_config.distribution_spec.docker_image or "python:3.10-slim"
 
     normal_deps, special_deps = get_provider_dependencies(
@@ -144,7 +148,12 @@ def build_image(build_config: BuildConfig, build_file_path: Path):
     if special_deps:
         args.append("#".join(special_deps))
 
-    return_code = run_with_pty(args)
+    is_terminal = sys.stdin.isatty()
+    if is_terminal:
+        return_code = run_with_pty(args)
+    else:
+        return_code = run_command(args)
+
     if return_code != 0:
         log.error(
             f"Failed to build target {build_config.name} with return code {return_code}",
diff --git a/llama_stack/distribution/build_container.sh b/llama_stack/distribution/build_container.sh
index 06cb19c32..17902de0a 100755
--- a/llama_stack/distribution/build_container.sh
+++ b/llama_stack/distribution/build_container.sh
@@ -54,7 +54,7 @@ add_to_docker() {
 
 # Update and install UBI9 components if UBI9 base image is used
 if [[ $docker_base == *"registry.access.redhat.com/ubi9"* ]]; then
-  add_to_docker <<EOF
+  add_to_docker << EOF
 FROM $docker_base
 WORKDIR /app
 
@@ -64,7 +64,7 @@ RUN microdnf -y update && microdnf install -y iputils net-tools wget \
 
 EOF
 else
-  add_to_docker <<EOF
+  add_to_docker << EOF
 FROM $docker_base
 WORKDIR /app
 
@@ -82,13 +82,17 @@ fi
 # Add pip dependencies first since llama-stack is what will change most often
 # so we can reuse layers.
 if [ -n "$pip_dependencies" ]; then
-  add_to_docker "RUN pip install --no-cache $pip_dependencies"
+  add_to_docker << EOF
+RUN pip install --no-cache $pip_dependencies
+EOF
 fi
 
 if [ -n "$special_pip_deps" ]; then
   IFS='#' read -ra parts <<<"$special_pip_deps"
   for part in "${parts[@]}"; do
-    add_to_docker "RUN pip install --no-cache $part"
+    add_to_docker <<EOF
+RUN pip install --no-cache $part
+EOF
   done
 fi
 
@@ -104,14 +108,19 @@ if [ -n "$LLAMA_STACK_DIR" ]; then
   # Install in editable format. We will mount the source code into the container
   # so that changes will be reflected in the container without having to do a
   # rebuild. This is just for development convenience.
-  add_to_docker "RUN pip install --no-cache -e $stack_mount"
+  add_to_docker << EOF
+RUN pip install --no-cache -e $stack_mount
+EOF
 else
   if [ -n "$TEST_PYPI_VERSION" ]; then
     # these packages are damaged in test-pypi, so install them first
-    add_to_docker "RUN pip install fastapi libcst"
-    add_to_docker <<EOF
+    add_to_docker << EOF
+RUN pip install fastapi libcst
+EOF
+    add_to_docker << EOF
 RUN pip install --no-cache --extra-index-url https://test.pypi.org/simple/ \
   llama-models==$TEST_PYPI_VERSION llama-stack-client==$TEST_PYPI_VERSION llama-stack==$TEST_PYPI_VERSION
+
 EOF
   else
     if [ -n "$PYPI_VERSION" ]; then
@@ -119,7 +128,9 @@ EOF
     else
       SPEC_VERSION="llama-stack"
     fi
-    add_to_docker "RUN pip install --no-cache $SPEC_VERSION"
+    add_to_docker << EOF
+RUN pip install --no-cache $SPEC_VERSION
+EOF
   fi
 fi
 
@@ -129,14 +140,14 @@ if [ -n "$LLAMA_MODELS_DIR" ]; then
     exit 1
   fi
 
-  add_to_docker <<EOF
+  add_to_docker << EOF
 RUN pip uninstall -y llama-models
 RUN pip install --no-cache $models_mount
 
 EOF
 fi
 
-add_to_docker <<EOF
+add_to_docker << EOF
 
 # This would be good in production but for debugging flexibility lets not add it right now
 # We need a more solid production ready entrypoint.sh anyway
diff --git a/llama_stack/distribution/utils/exec.py b/llama_stack/distribution/utils/exec.py
index 7b06e384d..9b4d0acee 100644
--- a/llama_stack/distribution/utils/exec.py
+++ b/llama_stack/distribution/utils/exec.py
@@ -98,9 +98,11 @@ def run_with_pty(command):
 
 
 def run_command(command):
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    output, error = process.communicate()
-    if process.returncode != 0:
-        log.error(f"Error: {error.decode('utf-8')}")
-        sys.exit(1)
-    return output.decode("utf-8")
+    try:
+        result = subprocess.run(command, capture_output=True, text=True, check=True)
+        print("Script Output\n", result.stdout)
+        return result.returncode
+    except subprocess.CalledProcessError as e:
+        print("Error running script:", e)
+        print("Error output:", e.stderr)
+        return e.returncode