diff --git a/server.json b/server.json
index 259ae4bb7..488144a81 100644
--- a/server.json
+++ b/server.json
@@ -21,43 +21,44 @@
         {
           "type": "positional",
           "value": "run",
-          "description": "The runtime command to execute"
+          "description": "The runtime command to execute",
+          "isRequired": true
         },
         {
           "type": "named",
           "name": "-i",
-          "description": "Run container in interactive mode"
+          "value": "true",
+          "description": "Run container in interactive mode",
+          "format": "boolean",
+          "isRequired": true
         },
         {
           "type": "named",
           "name": "--rm",
-          "description": "Automatically remove the container when it exits"
+          "value": "true",
+          "description": "Automatically remove the container when it exits",
+          "format": "boolean"
         },
         {
           "type": "named",
           "name": "-e",
-          "description": "Set an environment variable in the runtime"
-        },
-        {
-          "type": "positional",
-          "valueHint": "env_var_name",
-          "value": "GITHUB_PERSONAL_ACCESS_TOKEN",
-          "description": "Environment variable name"
+          "description": "Set an environment variable in the runtime",
+          "value": "GITHUB_PERSONAL_ACCESS_TOKEN={token}",
+          "isRequired": true,
+          "variables": {
+            "token": {
+              "isRequired": true,
+              "isSecret": true,
+              "format": "string"
+            }
+          }
         },
         {
           "type": "positional",
           "valueHint": "image_name",
           "value": "ghcr.io/github/github-mcp-server",
-          "description": "The container image to run"
-        }
-      ],
-      "environmentVariables": [
-        {
-          "description": "Your GitHub personal access token with appropriate scopes.",
-          "isRequired": true,
-          "format": "string",
-          "isSecret": true,
-          "name": "GITHUB_PERSONAL_ACCESS_TOKEN"
+          "description": "The container image to run",
+          "isRequired": true
         }
       ]
     }