diff --git a/schemas/bgp.yml b/schemas/bgp.yml
index 8946b84..351738a 100644
--- a/schemas/bgp.yml
+++ b/schemas/bgp.yml
@@ -3,14 +3,15 @@
 ---
 version: "1.0"
 nodes:
-  # ===================================================================
+  # ================================================================
   # Autonomous System
-  # ===================================================================
+  # ================================================================
   - name: AutonomousSystem
     namespace: Infra
     description: BGP Autonomous System
     label: Autonomous System
     icon: mdi--cloud-outline
+    include_in_menu: false
     human_friendly_id:
       - asn__value
     order_by:
@@ -33,14 +34,15 @@ nodes:
           - name: public
             label: Public
 
-  # ===================================================================
+  # ================================================================
   # BGP Router Configuration (per device)
-  # ===================================================================
+  # ================================================================
   - name: BGPRouterConfig
     namespace: Infra
     description: BGP router configuration on a device
     label: BGP Router Config
     icon: mdi--router-wireless
+    include_in_menu: false
     human_friendly_id:
       - device__name__value
     display_label: "{{ router_id__value }}"
@@ -81,14 +83,15 @@ nodes:
         cardinality: many
         kind: Component
 
-  # ===================================================================
+  # ================================================================
   # BGP Peer Group
-  # ===================================================================
+  # ================================================================
   - name: BGPPeerGroup
     namespace: Infra
     description: BGP peer group template
     label: BGP Peer Group
     icon: mdi--account-group
+    include_in_menu: false
     human_friendly_id:
       - name__value
     display_label: "{{ name__value }}"
@@ -153,14 +156,15 @@ nodes:
         cardinality: one
         optional: true
 
-  # ===================================================================
+  # ================================================================
   # BGP Session (Neighbor)
-  # ===================================================================
+  # ================================================================
   - name: BGPSession
     namespace: Infra
     description: BGP neighbor session
     label: BGP Session
     icon: mdi--connection
+    include_in_menu: false
     human_friendly_id:
       - peer_address__value
     display_label: "{{ peer_address__value }}"
@@ -195,14 +199,15 @@ nodes:
         optional: true
         description: Remote peer device (for documentation)
 
-  # ===================================================================
+  # ================================================================
   # BGP Address Family Configuration
-  # ===================================================================
+  # ================================================================
   - name: BGPAddressFamily
     namespace: Infra
     description: BGP address family configuration
     label: BGP Address Family
     icon: mdi--format-list-bulleted
+    include_in_menu: false
     display_label: "{{ afi__value }}"
     attributes:
       - name: afi