diff --git a/schemas/bgp.yml b/schemas/bgp.yml
index 351738a..1cc509f 100644
--- a/schemas/bgp.yml
+++ b/schemas/bgp.yml
@@ -49,6 +49,7 @@ nodes:
     attributes:
       - name: router_id
         kind: IPHost
+        unique: true
         description: BGP Router ID
       - name: default_ipv4_unicast
         kind: Boolean
@@ -92,7 +93,10 @@ nodes:
     label: BGP Peer Group
     icon: mdi--account-group
     include_in_menu: false
+    uniqueness_constraints:
+      - ["bgp_config", "name__value"]
     human_friendly_id:
+      - bgp_config__router_id__value
       - name__value
     display_label: "{{ name__value }}"
     attributes:
@@ -165,7 +169,10 @@ nodes:
     label: BGP Session
     icon: mdi--connection
     include_in_menu: false
+    uniqueness_constraints:
+      - ["bgp_config", "peer_address__value"]
     human_friendly_id:
+      - bgp_config__router_id__value
       - peer_address__value
     display_label: "{{ peer_address__value }}"
     attributes: