diff --git a/templates/js/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl b/templates/js/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl
index 6a2b1b41f1..892ff8b82d 100644
--- a/templates/js/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl
+++ b/templates/js/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/js/custom-copilot-assistant-new/.vscode/launch.json.tpl b/templates/js/custom-copilot-assistant-new/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/js/custom-copilot-assistant-new/.vscode/launch.json.tpl
+++ b/templates/js/custom-copilot-assistant-new/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/js/custom-copilot-basic/.vscode/launch.json.tpl b/templates/js/custom-copilot-basic/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/js/custom-copilot-basic/.vscode/launch.json.tpl
+++ b/templates/js/custom-copilot-basic/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/js/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl b/templates/js/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/js/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl
+++ b/templates/js/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/js/custom-copilot-rag-customize/.vscode/launch.json.tpl b/templates/js/custom-copilot-rag-customize/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/js/custom-copilot-rag-customize/.vscode/launch.json.tpl
+++ b/templates/js/custom-copilot-rag-customize/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/js/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl b/templates/js/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl
index c7ff78c787..f0d5680f24 100644
--- a/templates/js/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl
+++ b/templates/js/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl
@@ -2,24 +2,24 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+                "group": "1-Teams",
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+                "group": "1-Teams",
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +66,13 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+                "group": "1-Teams",
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +83,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +94,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -142,27 +142,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/ts/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl b/templates/ts/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl
index d9d975d712..892ff8b82d 100644
--- a/templates/ts/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl
+++ b/templates/ts/custom-copilot-assistant-assistants-api/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,18 +98,18 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
-            },
-            {
+          },
+          {
             "name": "Launch Remote in Copilot (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/ts/custom-copilot-assistant-new/.vscode/launch.json.tpl b/templates/ts/custom-copilot-assistant-new/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/ts/custom-copilot-assistant-new/.vscode/launch.json.tpl
+++ b/templates/ts/custom-copilot-assistant-new/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/ts/custom-copilot-basic/.vscode/launch.json.tpl b/templates/ts/custom-copilot-basic/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/ts/custom-copilot-basic/.vscode/launch.json.tpl
+++ b/templates/ts/custom-copilot-basic/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/ts/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl b/templates/ts/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/ts/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl
+++ b/templates/ts/custom-copilot-rag-azure-ai-search/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/ts/custom-copilot-rag-customize/.vscode/launch.json.tpl b/templates/ts/custom-copilot-rag-customize/.vscode/launch.json.tpl
index d9d975d712..6eb45d4ae3 100644
--- a/templates/ts/custom-copilot-rag-customize/.vscode/launch.json.tpl
+++ b/templates/ts/custom-copilot-rag-customize/.vscode/launch.json.tpl
@@ -2,24 +2,34 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +76,18 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +98,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +109,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -111,10 +126,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 1
             },
@@ -129,10 +144,10 @@
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
 {{#enableTestToolByDefault}}
-                "group": "2-local",
+                "group": "2-Teams",
 {{/enableTestToolByDefault}}
 {{^enableTestToolByDefault}}
-                "group": "1-local",
+                "group": "1-Teams",
 {{/enableTestToolByDefault}}
                 "order": 2
             },
@@ -145,7 +160,12 @@
             ],
             "preLaunchTask": "Start Teams App in Desktop Client",
             "presentation": {
-                "group": "2-local",
+{{#enableTestToolByDefault}}
+                "group": "2-Teams",
+{{/enableTestToolByDefault}}
+{{^enableTestToolByDefault}}
+                "group": "1-Teams",
+{{/enableTestToolByDefault}}
                 "order": 3
             },
             "stopAll": true
@@ -169,27 +189,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "3-M365",
                 "order": 2
             },
             "stopAll": true
diff --git a/templates/ts/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl b/templates/ts/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl
index c7ff78c787..f0d5680f24 100644
--- a/templates/ts/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl
+++ b/templates/ts/custom-copilot-rag-microsoft365/.vscode/launch.json.tpl
@@ -2,24 +2,24 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Remote (Edge)",
+            "name": "Launch Remote in Teams (Edge)",
             "type": "msedge",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 1
+                "group": "1-Teams",
+                "order": 4
             },
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Chrome)",
+            "name": "Launch Remote in Teams (Chrome)",
             "type": "chrome",
             "request": "launch",
             "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
-                "group": "3-remote",
-                "order": 2
+                "group": "1-Teams",
+                "order": 5
             },
             "internalConsoleOptions": "neverOpen"
         },
@@ -66,13 +66,13 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
-            "name": "Launch Remote (Desktop)",
+            "name": "Launch Remote in Teams (Desktop)",
             "type": "node",
             "request": "launch",
             "preLaunchTask": "Start Teams App in Desktop Client (Remote)",
             "presentation": {
-                "group": "3-remote",
-                "order": 3
+                "group": "1-Teams",
+                "order": 6
             },
             "internalConsoleOptions": "neverOpen",
         {{#CEAEnabled}}
@@ -83,7 +83,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 3
             },
             "internalConsoleOptions": "neverOpen"
@@ -94,7 +94,7 @@
             "request": "launch",
             "url": "https://www.office.com/chat?auth=2&${account-hint}",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 4
             },
             "internalConsoleOptions": "neverOpen"
@@ -142,27 +142,27 @@
         {{#CEAEnabled}}
         },
         {
-            "name": "Preview in Copilot (Edge)",
+            "name": "Debug in Copilot (Edge)",
             "configurations": [
                 "Launch Remote in Copilot (Edge)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 1
             },
             "stopAll": true
             },
             {
-            "name": "Preview in Copilot (Chrome)",
+            "name": "Debug in Copilot (Chrome)",
             "configurations": [
                 "Launch Remote in Copilot (Chrome)",
                 "Attach to Local Service"
             ],
             "preLaunchTask": "Start Teams App Locally",
             "presentation": {
-                "group": "4-M365",
+                "group": "2-M365",
                 "order": 2
             },
             "stopAll": true