diff --git a/servers/com.github-mcp-docker.json b/servers/com.github-mcp-docker.json
index b2249c9..cb00a1e 100644
--- a/servers/com.github-mcp-docker.json
+++ b/servers/com.github-mcp-docker.json
@@ -19,13 +19,13 @@
       "ghcr.io/github/github-mcp-server"
     ],
     "env": {
-      "GITHUB_PERSONAL_ACCESS_TOKEN": "${input:GITHUB_TOKEN}",
+      "GITHUB_PERSONAL_ACCESS_TOKEN": "${input:GITHUB_PERSONAL_ACCESS_TOKEN}",
       "GITHUB_HOST": "${input:GITHUB_HOST}"
     },
     "metadata": {
       "inputs": [
         {
-          "id": "GITHUB_TOKEN",
+          "id": "GITHUB_PERSONAL_ACCESS_TOKEN",
           "label": "GitHub Personal Access Token",
           "description": "Token used to authenticate with the GitHub API. Requires repo and read:org scopes.",
           "type": "text",
diff --git a/servers/com.grafana-mcp-docker.json b/servers/com.grafana-mcp-docker.json
index 834374d..b4629ff 100644
--- a/servers/com.grafana-mcp-docker.json
+++ b/servers/com.grafana-mcp-docker.json
@@ -24,7 +24,7 @@
     ],
     "env": {
       "GRAFANA_URL": "${input:GRAFANA_URL}",
-      "GRAFANA_SERVICE_ACCOUNT_TOKEN": "${input:GRAFANA_TOKEN}",
+      "GRAFANA_SERVICE_ACCOUNT_TOKEN": "${input:GRAFANA_SERVICE_ACCOUNT_TOKEN}",
       "GRAFANA_USERNAME": "${input:GRAFANA_USERNAME}",
       "GRAFANA_PASSWORD": "${input:GRAFANA_PASSWORD}",
       "GRAFANA_ORG_ID": "${input:GRAFANA_ORG_ID}"
@@ -41,7 +41,7 @@
           "placeholder": "http://localhost:3000"
         },
         {
-          "id": "GRAFANA_TOKEN",
+          "id": "GRAFANA_SERVICE_ACCOUNT_TOKEN",
           "label": "Grafana Service Account Token",
           "description": "Service account token with appropriate permissions. Create a service account with the Editor role for full read/write access.",
           "type": "text",