diff --git a/.env b/.env
index d090f6a723..8cb18db3b6 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,16 @@
+# NOTE: Sensitive ENV vars are overridden with their real values in .env.local
+# for local development and in the "Environment Variables" setting on Vercel
+# for production (https://vercel.com/roo-code/roo-code-cloud/settings/environment-variables).
+
+# Deep Links
 VSCODE_EXTENSION_BASE_URL=vscode://RooVeterinaryInc.roo-cline
 CURSOR_EXTENSION_BASE_URL=cursor://RooVeterinaryInc.roo-cline
 
 # Clerk
+CLERK_SECRET_KEY=your_clerk_secret_key
+NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=pk_test_ZXBpYy1jaGFtb2lzLTg1LmNsZXJrLmFjY291bnRzLmRldiQ
+NEXT_PUBLIC_CLERK_FRONTEND_API=https://epic-chamois-85.clerk.accounts.dev
+
 # https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects
 NEXT_PUBLIC_CLERK_SIGN_IN_URL=/sign-in
 NEXT_PUBLIC_CLERK_SIGN_UP_URL=/sign-up
@@ -9,8 +18,8 @@ NEXT_PUBLIC_CLERK_SIGN_IN_FORCE_REDIRECT_URL=/dashboard
 NEXT_PUBLIC_CLERK_SIGN_UP_FORCE_REDIRECT_URL=/dashboard
 NEXT_PUBLIC_CLERK_SIGN_IN_FALLBACK_REDIRECT_URL=/dashboard
 NEXT_PUBLIC_CLERK_SIGN_UP_FALLBACK_REDIRECT_URL=/dashboard
-NEXT_PUBLIC_CLERK_FRONTEND_API=https://epic-chamois-85.clerk.accounts.dev
-NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=pk_test_ZXBpYy1jaGFtb2lzLTg1LmNsZXJrLmFjY291bnRzLmRldiQ
 
 # ClickHouse
+CLICKHOUSE_URL=your_clickhouse_url
 CLICKHOUSE_USERNAME=default
+CLICKHOUSE_PASSWORD=fake-your_clickhouse_password
diff --git a/.env.local.sample b/.env.local.sample
deleted file mode 100644
index 3430599d24..0000000000
--- a/.env.local.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-CLERK_SECRET_KEY=your_clerk_secret_key
-
-CLICKHOUSE_URL=your_clickhouse_url
-CLICKHOUSE_PASSWORD=fake-your_clickhouse_password