diff --git a/.mcp.json b/.mcp.json
index 370b66f..eac2b9c 100644
--- a/.mcp.json
+++ b/.mcp.json
@@ -1,5 +1,12 @@
 {
   "mcpServers": {
+    "github": {
+      "type": "http",
+      "url": "https://api.githubcopilot.com/mcp/",
+      "headers": {
+        "Authorization": "Bearer ${GITHUB_TOKEN}"
+      }
+    },
     "kubernetes": {
       "type": "sse",
       "url": "http://localhost:8080/sse"
@@ -8,18 +15,14 @@
       "type": "sse",
       "url": "http://localhost:8081/sse"
     },
-    "homeassistant": {
-      "type": "sse",
-      "url": "http://localhost:8087/sse"
-    },
-    "github": {
-      "type": "sse",
-      "url": "http://localhost:8088/sse"
-    },
     "playwright": {
       "type": "sse",
       "url": "http://playwright-mcp.playwright.svc.cluster.local:3000/sse"
-    } 
+    },
+    "pgtuner": {
+      "type": "sse",
+      "url": "http://localhost:8085/sse"
+    }
   }
 }
 
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 66a78f5..db62937 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -232,6 +232,40 @@ spec:
           resources:
             {{- toYaml .Values.mcpSidecars.github.resources | nindent 12 }}
         {{- end }}
+        {{- if .Values.mcpSidecars.pgtuner.enabled }}
+        - name: pgtuner-mcp
+          image: "{{ .Values.mcpSidecars.pgtuner.image.repository }}:{{ .Values.mcpSidecars.pgtuner.image.tag }}"
+          imagePullPolicy: Always
+          command: ["python", "-m", "pgtuner_mcp", "--transport", "sse", "--port", "{{ .Values.mcpSidecars.pgtuner.port }}"]
+          ports:
+            - name: pgtuner
+              containerPort: {{ .Values.mcpSidecars.pgtuner.port }}
+          env:
+            - name: DATABASE_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "antigravity.envSecretName" . }}
+                  key: database-uri
+                  optional: true
+            - name: PGTUNER_EXCLUDE_USERIDS
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "antigravity.envSecretName" . }}
+                  key: pgtuner-exclude-userids
+                  optional: true
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.mcpSidecars.pgtuner.port }}
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.mcpSidecars.pgtuner.port }}
+            initialDelaySeconds: 5
+            periodSeconds: 5
+          resources:
+            {{- toYaml .Values.mcpSidecars.pgtuner.resources | nindent 12 }}
+        {{- end }}
       volumes:
         - name: workspace
           emptyDir: {}
diff --git a/chart/values.yaml b/chart/values.yaml
index adc1a17..8b1688d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -121,3 +121,16 @@ mcpSidecars:
       limits:
         memory: "256Mi"
         cpu: "500m"
+  pgtuner:
+    enabled: false  # Disabled by default, requires DATABASE_URI in secrets
+    image:
+      repository: dog830228/pgtuner_mcp
+      tag: latest  # TODO: pin to specific version once stable release available
+    port: 8085
+    resources:
+      requests:
+        memory: "64Mi"
+        cpu: "50m"
+      limits:
+        memory: "256Mi"
+        cpu: "500m"