diff --git a/registry/manager/agent/agent_test.go b/registry/manager/agent/agent_test.go
index b276e214..1cf32fa4 100644
--- a/registry/manager/agent/agent_test.go
+++ b/registry/manager/agent/agent_test.go
@@ -583,9 +583,9 @@ func TestScanDependencies(t *testing.T) {
 	os.WriteFile(filepath.Join(assistantDir, "package.yao"), []byte(`{
 		"name":"test-scan",
 		"mcp": {
-			"servers": {
-				"rag": {"server_id": "yao.rag-tools"}
-			}
+			"servers": [
+				{"server_id": "yao.rag-tools"}
+			]
 		}
 	}`), 0644)
 
@@ -610,9 +610,9 @@ func TestScanDependenciesSkipUnscoped(t *testing.T) {
 	os.WriteFile(filepath.Join(assistantDir, "package.yao"), []byte(`{
 		"name":"test-local",
 		"mcp": {
-			"servers": {
-				"echo": {"server_id": "echo"}
-			}
+			"servers": [
+				{"server_id": "echo"}
+			]
 		}
 	}`), 0644)
 
diff --git a/registry/manager/agent/scan.go b/registry/manager/agent/scan.go
index 9d831360..36885c60 100644
--- a/registry/manager/agent/scan.go
+++ b/registry/manager/agent/scan.go
@@ -19,7 +19,7 @@ type packageYao struct {
 }
 
 type mcpConfig struct {
-	Servers map[string]mcpServerEntry `json:"servers,omitempty"`
+	Servers []mcpServerEntry `json:"servers,omitempty"`
 }
 
 type mcpServerEntry struct {
diff --git a/registry/manager/e2e_helpers_test.go b/registry/manager/e2e_helpers_test.go
index 6e4fb792..81529b87 100644
--- a/registry/manager/e2e_helpers_test.go
+++ b/registry/manager/e2e_helpers_test.go
@@ -178,9 +178,9 @@ func buildV2AgentApp(t *testing.T) string {
   "options": { "temperature": 0.5 },
   "public": false,
   "mcp": {
-    "servers": {
-      "registry-mcp": { "server_id": "`+testScope+`.registry-mcp" }
-    }
+    "servers": [
+      { "server_id": "`+testScope+`.registry-mcp" }
+    ]
   },
   "tags": ["Test", "Registry", "V2"],
   "sort": 999,
@@ -309,10 +309,10 @@ func buildV2AnalyticsApp(t *testing.T) string {
   "options": { "temperature": 0.2 },
   "public": false,
   "mcp": {
-    "servers": {
-      "registry-mcp": { "server_id": "`+testScope+`.registry-mcp" },
-      "data-tools": { "server_id": "`+testScope+`.data-tools" }
-    }
+    "servers": [
+      { "server_id": "`+testScope+`.registry-mcp" },
+      { "server_id": "`+testScope+`.data-tools" }
+    ]
   },
   "tags": ["Test", "Registry", "Analytics", "V2"],
   "sort": 998,