diff --git a/agents/goq/anvillm-agent.md b/agents/goq/anvillm-agent.md
index ce1f339..8030934 100644
--- a/agents/goq/anvillm-agent.md
+++ b/agents/goq/anvillm-agent.md
@@ -1,3 +1,5 @@
 ---
 no_implicit_system_prompt: true
+mcp_servers:
+  - *
 ---
diff --git a/agents/goq/goq.json b/agents/goq/goq.json
new file mode 100644
index 0000000..dad43d6
--- /dev/null
+++ b/agents/goq/goq.json
@@ -0,0 +1,15 @@
+{
+  "mcpServers": {
+    "anvilmcp": {
+      "command": ["anvilmcp"]
+    },
+    "superpowers-mcp-server": {
+      "command": ["superpowers-mcp-server"],
+      "env": {
+        "SUPERPOWERD_SESSION_TOKEN": "${SUPERPOWERD_SESSION_TOKEN}",
+        "SUPERPOWERD_SOCKET_DIR": "${SUPERPOWERD_SOCKET_DIR}",
+        "XDG_RUNTIME_DIR": "${XDG_RUNTIME_DIR}"
+      }
+    }
+  }
+}
diff --git a/cfg/backends/goq.yaml b/cfg/backends/goq.yaml
index 68c2f63..5dc38ef 100644
--- a/cfg/backends/goq.yaml
+++ b/cfg/backends/goq.yaml
@@ -11,6 +11,7 @@ filesystem:
     - "{XDG_DATA_HOME}/kiro-cli"
     - "{CWD}/.kiro"
     - "/dev/tty"
+    - "{XDG_RUNTIME_DIR}/superpowerd"
 network:
   unrestricted: true
 env:
@@ -20,3 +21,6 @@ env:
   - ANTHROPIC_API_KEY
   - GITHUB_TOKEN
   - KIRO_API_KEY
+  - SUPERPOWERD_SESSION_TOKEN
+  - SUPERPOWERD_SOCKET_DIR
+  - XDG_RUNTIME_DIR
diff --git a/mkfile b/mkfile
index 19069d5..99e6ac8 100644
--- a/mkfile
+++ b/mkfile
@@ -26,6 +26,7 @@ build:V:
 	chmod +x $HOME/.config/anvillm/claude/hooks/*.sh
 	bash hooks/claude/install-hooks.sh
 	mkdir -p $HOME/.config/goq/agents
+	cp agents/goq/goq.json $HOME/.config/goq/goq.json
 	cat agents/goq/anvillm-agent.md agents/OUTPUT_PROTOCOL.md agents/SKILLS_PROMPT.md > $HOME/.config/goq/agents/anvillm-agent.md
 	mkdir -p $HOME/.config/anvillm/tools
 	cp tools/*.sh $HOME/.config/anvillm/tools/