diff --git a/schemas/base.yml b/schemas/base.yml
index ca6685b..7e33dc4 100644
--- a/schemas/base.yml
+++ b/schemas/base.yml
@@ -129,10 +129,6 @@ nodes:
             label: Border Leaf
             color: "#f59e0b"
         description: Fabric role
-      - name: router_id
-        kind: IPHost
-        optional: true
-        description: BGP Router ID (typically Loopback0)
       - name: status
         kind: Dropdown
         default_value: active
diff --git a/schemas/bgp.yml b/schemas/bgp.yml
index 1cc509f..060b277 100644
--- a/schemas/bgp.yml
+++ b/schemas/bgp.yml
@@ -66,6 +66,18 @@ nodes:
         kind: Number
         default_value: 64
         description: Maximum ECMP routes
+      - name: ebgp_distance
+        kind: Number
+        default_value: 20
+        description: eBGP administrative distance
+      - name: ibgp_distance
+        kind: Number
+        default_value: 200
+        description: iBGP administrative distance
+      - name: local_distance
+        kind: Number
+        default_value: 200
+        description: Local route administrative distance
     relationships:
       - name: device
         peer: InfraDevice