diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 4fb6637..b48de07 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,7 +2,7 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Borealis - Server (Flask)",
+      "label": "Borealis - Server (Production)",
       "type": "shell",
       "command": "powershell.exe",
       "args": [
@@ -17,7 +17,7 @@
       "problemMatcher": []
     },
     {
-      "label": "Borealis - Server (Vite)",
+      "label": "Borealis - Server (Dev)",
       "type": "shell",
       "command": "powershell.exe",
       "args": [
diff --git a/Borealis.ps1 b/Borealis.ps1
index 67642cf..00690ad 100644
--- a/Borealis.ps1
+++ b/Borealis.ps1
@@ -27,6 +27,8 @@ if ($Vite -and $Flask) {
 }
 
 if ($Server) {
+    # Auto-select main menu option for Server when -Server flag is provided
+    $choice = '1'
 } elseif ($Agent) {
     $choice = '2'
     switch ($AgentAction) {