diff --git a/packages/test/test-end-to-end-tests/.vscode/launch.json b/packages/test/test-end-to-end-tests/.vscode/launch.json
index 505cf7408a41..e28795c92448 100644
--- a/packages/test/test-end-to-end-tests/.vscode/launch.json
+++ b/packages/test/test-end-to-end-tests/.vscode/launch.json
@@ -11,7 +11,7 @@
 			"env": {
 				"fluid__test__driver": "local",
 				"fluid__test__backCompat": "${input:backCompat}",
-				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutputt}",
+				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutput}",
 			},
 			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/mocha",
 			"windows": {
@@ -55,7 +55,7 @@
 			"env": {
 				"fluid__test__driver": "t9s",
 				"fluid__test__backCompat": "${input:backCompat}",
-				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutputt}",
+				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutput}",
 			},
 			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/mocha",
 			"windows": {
@@ -109,8 +109,10 @@
 			"env": {
 				"fluid__test__driver": "odsp",
 				"fluid__test__backCompat": "${input:backCompat}",
-				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutputt}",
+				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutput}",
 				"fluid__test__odspEndpointName": "${input:odspEndpoint}",
+				"login__odsp__test__tenants": "${input:login__odsp__test__tenants}",
+				"login__microsoft__clientId": "${input:login__microsoft__clientId}",
 			},
 			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/mocha",
 			"windows": {
@@ -146,7 +148,8 @@
 				"fluid__test__driver": "r11s",
 				"fluid__test__backCompat": "${input:backCompat}",
 				"fluid__test__r11sEndpointName": "${input:r11sEndpoint}",
-				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutputt}",
+				"FLUID_TEST_VERBOSE": "${input:verboseConsoleOutput}",
+				"fluid__test__driver__frs": "${input:fluid__test__driver__frs}",
 			},
 			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/mocha",
 			"windows": {
@@ -208,7 +211,7 @@
 			],
 		},
 		{
-			"id": "verboseConsoleOutputt",
+			"id": "verboseConsoleOutput",
 			"description": "Show console output?",
 			"default": "",
 			"type": "pickString",
@@ -245,5 +248,23 @@
 				},
 			],
 		},
+		{
+			"id": "fluid__test__driver__frs",
+			"description": "FRS Tenant info from our team key vault. Check your env vars after running getkeys",
+			"type": "promptString",
+			"password": true,
+		},
+		{
+			"id": "login__odsp__test__tenants",
+			"description": "ODSP Tenant info from our team key vault. Check your env vars after running getkeys",
+			"type": "promptString",
+			"password": true,
+		},
+		{
+			"id": "login__microsoft__clientId",
+			"description": "Client ID for authenticating to test ODSP tenants. Check your env vars after running getkeys",
+			"type": "promptString",
+			"password": true,
+		},
 	],
 }
diff --git a/tools/getkeys/README.md b/tools/getkeys/README.md
index 4c7b22f3171a..90811af0cf09 100644
--- a/tools/getkeys/README.md
+++ b/tools/getkeys/README.md
@@ -10,6 +10,7 @@ prague-secrets or WAC Bohemia security group.
 
 1. Install the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli), run `az login` and authenticate
    with your Microsoft corporate account.
+   - Choose Azure Subscription `Fluid` when prompted.
 2. In this folder, run `pnpm install`, then `npm start`.
 
 You should restart the console/shell after running the script (or for bash/zsh run `source ~/.bashrc` or `source ~/.zshrc`)