diff --git a/samples/csharp/quickstart/.env-template b/samples/csharp/quickstart/.env-template
index 0ec5c463..e0d4f902 100644
--- a/samples/csharp/quickstart/.env-template
+++ b/samples/csharp/quickstart/.env-template
@@ -1,3 +1,3 @@
-AZURE_AI_PROJECT_ENDPOINT=
-AZURE_AI_FOUNDRY_AGENT_NAME=MyAgent
-AZURE_AI_FOUNDRY_MODEL_DEPLOYMENT_NAME=gpt-4.1-mini
\ No newline at end of file
+PROJECT_ENDPOINT=
+AGENT_NAME=MyAgent
+MODEL_DEPLOYMENT_NAME=gpt-4.1-mini
diff --git a/samples/python/quickstart/.env-template b/samples/python/quickstart/.env-template
index 14d01f4c..6dbc5816 100644
--- a/samples/python/quickstart/.env-template
+++ b/samples/python/quickstart/.env-template
@@ -2,6 +2,6 @@
 # Update with appropriate values
 # Rename the file to .env after updating
 
-AZURE_AI_FOUNDRY_PROJECT_ENDPOINT="https://<YOUR-RESOURCE-NAME>.services.ai.azure.com/api/projects/<YOUR-PROJECT-NAME>"
-AZURE_AI_FOUNDRY_AGENT_NAME="MyAgent"
-AZURE_AI_FOUNDRY_MODEL_DEPLOYMENT_NAME="gpt-4.1-mini"
\ No newline at end of file
+PROJECT_ENDPOINT="https://<YOUR-RESOURCE-NAME>.services.ai.azure.com/api/projects/<YOUR-PROJECT-NAME>"
+AGENT_NAME="MyAgent"
+MODEL_DEPLOYMENT_NAME="gpt-4.1-mini"
diff --git a/samples/typescript/quickstart/.env-template b/samples/typescript/quickstart/.env-template
index 0ec5c463..e0d4f902 100644
--- a/samples/typescript/quickstart/.env-template
+++ b/samples/typescript/quickstart/.env-template
@@ -1,3 +1,3 @@
-AZURE_AI_PROJECT_ENDPOINT=
-AZURE_AI_FOUNDRY_AGENT_NAME=MyAgent
-AZURE_AI_FOUNDRY_MODEL_DEPLOYMENT_NAME=gpt-4.1-mini
\ No newline at end of file
+PROJECT_ENDPOINT=
+AGENT_NAME=MyAgent
+MODEL_DEPLOYMENT_NAME=gpt-4.1-mini