diff --git a/.gitignore b/.gitignore
index 4295575c0..6884e37e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,8 @@ Package.resolved
 .vscode
 _build
 docs/src
-docs/notebooks/nvidia/tool_calling/tmp/
+# Sample tool-calling datasets generated by NVIDIA notebooks
+docs/notebooks/nvidia/tool_calling/sample_data/
 pyrightconfig.json
 venv/
 pytest-report.xml
diff --git a/docs/notebooks/nvidia/beginner_e2e/Llama_Stack_NVIDIA_E2E_Flow.ipynb b/docs/notebooks/nvidia/beginner_e2e/Llama_Stack_NVIDIA_E2E_Flow.ipynb
index e4698db81..000422c3f 100644
--- a/docs/notebooks/nvidia/beginner_e2e/Llama_Stack_NVIDIA_E2E_Flow.ipynb
+++ b/docs/notebooks/nvidia/beginner_e2e/Llama_Stack_NVIDIA_E2E_Flow.ipynb
@@ -136,7 +136,6 @@
     "from docs.notebooks.nvidia.beginner_e2e.config import *\n",
     "\n",
     "# Metadata associated with Datasets and Customization Jobs\n",
-    "os.environ[\"NVIDIA_USER_ID\"] = USER_ID\n",
     "os.environ[\"NVIDIA_DATASET_NAMESPACE\"] = NAMESPACE\n",
     "os.environ[\"NVIDIA_PROJECT_ID\"] = PROJECT_ID\n",
     "\n",
diff --git a/docs/notebooks/nvidia/beginner_e2e/config.py b/docs/notebooks/nvidia/beginner_e2e/config.py
index 401d93f89..b01ba095b 100644
--- a/docs/notebooks/nvidia/beginner_e2e/config.py
+++ b/docs/notebooks/nvidia/beginner_e2e/config.py
@@ -18,9 +18,6 @@ HF_TOKEN = ""
 # (Optional) Namespace to associate with Datasets and Customization jobs
 NAMESPACE = "nvidia-e2e-tutorial"
 
-# (Optional) NVIDIA User ID - currently unused
-USER_ID = ""
-
 # (Optional) Entity Store Project ID. Modify if you've created a project in Entity Store that you'd
 # like to associate with your Customized models.
 PROJECT_ID = ""
diff --git a/docs/notebooks/nvidia/tool_calling/1_data_preparation.ipynb b/docs/notebooks/nvidia/tool_calling/1_data_preparation.ipynb
index f3fb5ed9a..6c7d61fbe 100644
--- a/docs/notebooks/nvidia/tool_calling/1_data_preparation.ipynb
+++ b/docs/notebooks/nvidia/tool_calling/1_data_preparation.ipynb
@@ -154,7 +154,7 @@
    "outputs": [],
    "source": [
     "# Processed data will be stored here\n",
-    "DATA_ROOT = os.path.join(os.getcwd(), \"tmp\")\n",
+    "DATA_ROOT = os.path.join(os.getcwd(), \"sample_data\")\n",
     "CUSTOMIZATION_DATA_ROOT = os.path.join(DATA_ROOT, \"customization\")\n",
     "VALIDATION_DATA_ROOT = os.path.join(DATA_ROOT, \"validation\")\n",
     "EVALUATION_DATA_ROOT = os.path.join(DATA_ROOT, \"evaluation\")\n",
diff --git a/docs/notebooks/nvidia/tool_calling/2_finetuning_and_inference.ipynb b/docs/notebooks/nvidia/tool_calling/2_finetuning_and_inference.ipynb
index 15632e450..647a16b6d 100644
--- a/docs/notebooks/nvidia/tool_calling/2_finetuning_and_inference.ipynb
+++ b/docs/notebooks/nvidia/tool_calling/2_finetuning_and_inference.ipynb
@@ -30,7 +30,6 @@
    "outputs": [],
    "source": [
     "# Metadata associated with Datasets and Customization Jobs\n",
-    "os.environ[\"NVIDIA_USER_ID\"] = USER_ID\n",
     "os.environ[\"NVIDIA_DATASET_NAMESPACE\"] = NMS_NAMESPACE\n",
     "os.environ[\"NVIDIA_PROJECT_ID\"] = PROJECT_ID\n",
     "\n",
@@ -164,7 +163,7 @@
    "outputs": [],
    "source": [
     "# Path where data preparation notebook saved finetuning and evaluation data\n",
-    "DATA_ROOT = os.path.join(os.getcwd(), \"tmp\")\n",
+    "DATA_ROOT = os.path.join(os.getcwd(), \"sample_data\")\n",
     "CUSTOMIZATION_DATA_ROOT = os.path.join(DATA_ROOT, \"customization\")\n",
     "VALIDATION_DATA_ROOT = os.path.join(DATA_ROOT, \"validation\")\n",
     "EVALUATION_DATA_ROOT = os.path.join(DATA_ROOT, \"evaluation\")\n",
diff --git a/docs/notebooks/nvidia/tool_calling/3_model_evaluation.ipynb b/docs/notebooks/nvidia/tool_calling/3_model_evaluation.ipynb
index 0ccbd4169..5a1316adb 100644
--- a/docs/notebooks/nvidia/tool_calling/3_model_evaluation.ipynb
+++ b/docs/notebooks/nvidia/tool_calling/3_model_evaluation.ipynb
@@ -30,7 +30,6 @@
    "outputs": [],
    "source": [
     "# Metadata associated with Datasets and Customization Jobs\n",
-    "os.environ[\"NVIDIA_USER_ID\"] = USER_ID\n",
     "os.environ[\"NVIDIA_DATASET_NAMESPACE\"] = NMS_NAMESPACE\n",
     "os.environ[\"NVIDIA_PROJECT_ID\"] = PROJECT_ID\n",
     "\n",
diff --git a/docs/notebooks/nvidia/tool_calling/4_adding_safety_guardrails.ipynb b/docs/notebooks/nvidia/tool_calling/4_adding_safety_guardrails.ipynb
index da070462a..699a561f9 100644
--- a/docs/notebooks/nvidia/tool_calling/4_adding_safety_guardrails.ipynb
+++ b/docs/notebooks/nvidia/tool_calling/4_adding_safety_guardrails.ipynb
@@ -30,7 +30,6 @@
    "outputs": [],
    "source": [
     "# Metadata associated with Datasets and Customization Jobs\n",
-    "os.environ[\"NVIDIA_USER_ID\"] = USER_ID\n",
     "os.environ[\"NVIDIA_DATASET_NAMESPACE\"] = NMS_NAMESPACE\n",
     "os.environ[\"NVIDIA_PROJECT_ID\"] = PROJECT_ID\n",
     "\n",
diff --git a/docs/notebooks/nvidia/tool_calling/config.py b/docs/notebooks/nvidia/tool_calling/config.py
index 009c63e3c..42d31119c 100644
--- a/docs/notebooks/nvidia/tool_calling/config.py
+++ b/docs/notebooks/nvidia/tool_calling/config.py
@@ -22,8 +22,6 @@ NDS_TOKEN = "token"
 NMS_NAMESPACE = "nvidia-tool-calling-tutorial"
 DATASET_NAME = "xlam-ft-dataset-1"
 
-# (Optional) NVIDIA User ID - currently unused
-USER_ID = ""
 # (Optional) Entity Store Project ID. Modify if you've created a project in Entity Store that you'd
 # like to associate with your Customized models.
 PROJECT_ID = ""
diff --git a/llama_stack/providers/remote/datasetio/nvidia/README.md b/llama_stack/providers/remote/datasetio/nvidia/README.md
index 1d3d15132..8b1e2e6ee 100644
--- a/llama_stack/providers/remote/datasetio/nvidia/README.md
+++ b/llama_stack/providers/remote/datasetio/nvidia/README.md
@@ -32,7 +32,6 @@ import os
 
 os.environ["NVIDIA_API_KEY"] = "your-api-key"
 os.environ["NVIDIA_CUSTOMIZER_URL"] = "http://nemo.test"
-os.environ["NVIDIA_USER_ID"] = "llama-stack-user"
 os.environ["NVIDIA_DATASET_NAMESPACE"] = "default"
 os.environ["NVIDIA_PROJECT_ID"] = "test-project"
 from llama_stack.distribution.library_client import LlamaStackAsLibraryClient