diff --git a/arch/arch_config_schema.yaml b/arch/arch_config_schema.yaml
index 28e9d2e6..93b34a1e 100644
--- a/arch/arch_config_schema.yaml
+++ b/arch/arch_config_schema.yaml
@@ -14,10 +14,38 @@ properties:
     type: array
     items:
       type: object
+      properties:
+        id:
+          type: string
+        url:
+          type: string
+      additionalProperties: false
+      required:
+        - id
+        - url
   agent_filters:
     type: array
     items:
       type: object
+      properties:
+        id:
+          type: string
+        url:
+          type: string
+        type:
+          type: string
+          enum:
+            - mcp
+        transport:
+          type: string
+          enum:
+            - streamable-http
+        tool:
+          type: string
+      additionalProperties: false
+      required:
+        - id
+        - url
   listeners:
     oneOf:
       - type: array
diff --git a/crates/brightstaff/src/handlers/agent_selector.rs b/crates/brightstaff/src/handlers/agent_selector.rs
index 7fb1c07f..fc5b79ca 100644
--- a/crates/brightstaff/src/handlers/agent_selector.rs
+++ b/crates/brightstaff/src/handlers/agent_selector.rs
@@ -219,7 +219,7 @@ mod tests {
     fn create_test_agent_struct(name: &str) -> Agent {
         Agent {
             id: name.to_string(),
-            kind: Some("test".to_string()),
+            agent_type: Some("test".to_string()),
             url: "http://localhost:8080".to_string(),
             tool: None,
             transport: None,
diff --git a/crates/brightstaff/src/handlers/integration_tests.rs b/crates/brightstaff/src/handlers/integration_tests.rs
index 047204ca..e5bbf488 100644
--- a/crates/brightstaff/src/handlers/integration_tests.rs
+++ b/crates/brightstaff/src/handlers/integration_tests.rs
@@ -48,14 +48,14 @@ mod integration_tests {
         let agents = vec![
             Agent {
                 id: "filter-agent".to_string(),
-                kind: Some("filter".to_string()),
+                agent_type: Some("filter".to_string()),
                 url: "http://localhost:8081".to_string(),
                 tool: None,
                 transport: None,
             },
             Agent {
                 id: "terminal-agent".to_string(),
-                kind: Some("terminal".to_string()),
+                agent_type: Some("terminal".to_string()),
                 url: "http://localhost:8082".to_string(),
                 tool: None,
                 transport: None,
diff --git a/crates/brightstaff/src/handlers/pipeline_processor.rs b/crates/brightstaff/src/handlers/pipeline_processor.rs
index 00225ee8..85d41afc 100644
--- a/crates/brightstaff/src/handlers/pipeline_processor.rs
+++ b/crates/brightstaff/src/handlers/pipeline_processor.rs
@@ -577,7 +577,7 @@ mod tests {
             transport: None,
             tool: None,
             url: server_url,
-            kind: None,
+            agent_type: None,
         };
 
         let messages = vec![create_test_message(Role::User, "Hello")];
@@ -616,7 +616,7 @@ mod tests {
             transport: None,
             tool: None,
             url: server_url,
-            kind: None,
+            agent_type: None,
         };
 
         let messages = vec![create_test_message(Role::User, "Ping")];
@@ -668,7 +668,7 @@ mod tests {
             transport: None,
             tool: None,
             url: server_url,
-            kind: None,
+            agent_type: None,
         };
 
         let messages = vec![create_test_message(Role::User, "Hi")];
diff --git a/crates/common/src/configuration.rs b/crates/common/src/configuration.rs
index 50f34ca1..4bfb0460 100644
--- a/crates/common/src/configuration.rs
+++ b/crates/common/src/configuration.rs
@@ -24,7 +24,8 @@ pub struct Agent {
     pub transport: Option<String>,
     pub tool: Option<String>,
     pub url: String,
-    pub kind: Option<String>,
+    #[serde(rename = "type")]
+    pub agent_type: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/demos/use_cases/rag_agent/arch_config.yaml b/demos/use_cases/rag_agent/arch_config.yaml
index 0c44806a..d4b1c935 100644
--- a/demos/use_cases/rag_agent/arch_config.yaml
+++ b/demos/use_cases/rag_agent/arch_config.yaml
@@ -9,14 +9,11 @@ agents:
 agent_filters:
   - id: query_rewriter
     url: http://host.docker.internal:10501
-    # kind: mcp
+    # type: mcp
     # transport: streamable-http
     # tool: query_rewriter
   - id: context_builder
     url: http://host.docker.internal:10502
-    # kind: mcp
-    # transport: streamable-http
-    # tool: context_builder
 
 model_providers:
   - model: openai/gpt-4o-mini