diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6eaac63c5..281df3cc8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,6 +22,10 @@ ARG NAT_VERSION
 
 FROM --platform=$TARGETPLATFORM ${BASE_IMAGE_URL}:${BASE_IMAGE_TAG}
 
+ARG PYTHON_VERSION
+ARG UV_VERSION
+ARG NAT_VERSION
+
 COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/
 
 ENV PYTHONDONTWRITEBYTECODE=1
diff --git a/examples/evaluation_and_profiling/email_phishing_analyzer/Dockerfile b/examples/evaluation_and_profiling/email_phishing_analyzer/Dockerfile
index 5fe650b80..f66bc620c 100644
--- a/examples/evaluation_and_profiling/email_phishing_analyzer/Dockerfile
+++ b/examples/evaluation_and_profiling/email_phishing_analyzer/Dockerfile
@@ -22,6 +22,10 @@ ARG NAT_VERSION
 
 FROM ${BASE_IMAGE_URL}:${BASE_IMAGE_TAG}
 
+ARG PYTHON_VERSION
+ARG UV_VERSION
+ARG NAT_VERSION
+
 COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/
 
 ENV PYTHONDONTWRITEBYTECODE=1
diff --git a/examples/evaluation_and_profiling/email_phishing_analyzer/README.md b/examples/evaluation_and_profiling/email_phishing_analyzer/README.md
index 02620d10c..a74716665 100644
--- a/examples/evaluation_and_profiling/email_phishing_analyzer/README.md
+++ b/examples/evaluation_and_profiling/email_phishing_analyzer/README.md
@@ -225,7 +225,7 @@ For a production deployment, use Docker:
 
 Prior to building the Docker image ensure that you have followed the steps in the [Installation and Setup](#installation-and-setup) section, and you are currently in the NeMo Agent toolkit virtual environment.
 
-From the root directory of the Simple Calculator repository, build the Docker image:
+From the root directory of the NeMo Agent toolkit repository, build the Docker image:
 
 ```bash
 docker build --build-arg NAT_VERSION=$(python -m setuptools_scm) -t email_phishing_analyzer -f examples/evaluation_and_profiling/email_phishing_analyzer/Dockerfile .
diff --git a/examples/frameworks/agno_personal_finance/Dockerfile b/examples/frameworks/agno_personal_finance/Dockerfile
index 1f3076324..be0c4a122 100644
--- a/examples/frameworks/agno_personal_finance/Dockerfile
+++ b/examples/frameworks/agno_personal_finance/Dockerfile
@@ -22,6 +22,10 @@ ARG NAT_VERSION
 
 FROM ${BASE_IMAGE_URL}:${BASE_IMAGE_TAG}
 
+ARG PYTHON_VERSION
+ARG UV_VERSION
+ARG NAT_VERSION
+
 COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/
 
 ENV PYTHONDONTWRITEBYTECODE=1
diff --git a/examples/getting_started/simple_calculator/Dockerfile b/examples/getting_started/simple_calculator/Dockerfile
index 98a37127b..81e2b9138 100644
--- a/examples/getting_started/simple_calculator/Dockerfile
+++ b/examples/getting_started/simple_calculator/Dockerfile
@@ -22,6 +22,10 @@ ARG NAT_VERSION
 
 FROM ${BASE_IMAGE_URL}:${BASE_IMAGE_TAG}
 
+ARG PYTHON_VERSION
+ARG UV_VERSION
+ARG NAT_VERSION
+
 COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/
 
 ENV PYTHONDONTWRITEBYTECODE=1
diff --git a/examples/getting_started/simple_calculator/README.md b/examples/getting_started/simple_calculator/README.md
index 3e7594d86..baf4d8f04 100644
--- a/examples/getting_started/simple_calculator/README.md
+++ b/examples/getting_started/simple_calculator/README.md
@@ -87,7 +87,7 @@ For a production deployment, use Docker:
 
 Prior to building the Docker image ensure that you have followed the steps in the [Installation and Setup](#installation-and-setup) section, and you are currently in the NeMo Agent toolkit virtual environment.
 
-From the root directory of the Simple Calculator repository, build the Docker image:
+From the root directory of the NeMo Agent toolkit repository, build the Docker image:
 
 ```bash
 docker build --build-arg NAT_VERSION=$(python -m setuptools_scm) -t simple_calculator -f examples/getting_started/simple_calculator/Dockerfile .
diff --git a/examples/getting_started/simple_web_query/Dockerfile b/examples/getting_started/simple_web_query/Dockerfile
index 104eebdd5..c3649682a 100644
--- a/examples/getting_started/simple_web_query/Dockerfile
+++ b/examples/getting_started/simple_web_query/Dockerfile
@@ -22,6 +22,10 @@ ARG NAT_VERSION
 
 FROM ${BASE_IMAGE_URL}:${BASE_IMAGE_TAG}
 
+ARG PYTHON_VERSION
+ARG UV_VERSION
+ARG NAT_VERSION
+
 COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/
 
 ENV PYTHONDONTWRITEBYTECODE=1