diff --git a/yang/frr-bgp-common-multiprotocol.yang b/yang/frr-bgp-common-multiprotocol.yang
index c22bdf9964..f7f4ff5075 100644
--- a/yang/frr-bgp-common-multiprotocol.yang
+++ b/yang/frr-bgp-common-multiprotocol.yang
@@ -204,5 +204,15 @@ submodule frr-bgp-common-multiprotocol {
       description
         "IPv6 flowspec configuration options.";
     }
+
+    container linkstate-linkstate {
+      when "derived-from-or-self(../afi-safi-name, 'frr-rt:linkstate-linkstate')" {
+        description
+          "Include this container for Link-State specific
+           configuration.";
+      }
+      description
+        "Link-State configuration options.";
+    }
   }
 }
diff --git a/yang/frr-bgp.yang b/yang/frr-bgp.yang
index b34fd43e78..557b9ef81b 100644
--- a/yang/frr-bgp.yang
+++ b/yang/frr-bgp.yang
@@ -819,6 +819,17 @@ module frr-bgp {
     uses structure-neighbor-group-filter-config;
   }
 
+
+  augment "/frr-rt:routing/frr-rt:control-plane-protocols/frr-rt:control-plane-protocol/bgp/neighbors/neighbor/afi-safis/afi-safi/linkstate-linkstate" {
+    uses structure-neighbor-route-reflector;
+
+    uses structure-neighbor-route-server;
+
+    uses structure-neighbor-group-soft-reconfiguration;
+
+    uses structure-neighbor-group-filter-config;
+  }
+
   augment "/frr-rt:routing/frr-rt:control-plane-protocols/frr-rt:control-plane-protocol/bgp/neighbors/unnumbered-neighbor/afi-safis/afi-safi/ipv4-unicast" {
     uses structure-neighbor-group-add-paths;
 
@@ -1090,6 +1101,16 @@ module frr-bgp {
     uses structure-neighbor-group-filter-config;
   }
 
+  augment "/frr-rt:routing/frr-rt:control-plane-protocols/frr-rt:control-plane-protocol/bgp/neighbors/unnumbered-neighbor/afi-safis/afi-safi/linkstate-linkstate" {
+    uses structure-neighbor-route-reflector;
+
+    uses structure-neighbor-route-server;
+
+    uses structure-neighbor-group-soft-reconfiguration;
+
+    uses structure-neighbor-group-filter-config;
+  }
+
   augment "/frr-rt:routing/frr-rt:control-plane-protocols/frr-rt:control-plane-protocol/bgp/peer-groups/peer-group/afi-safis/afi-safi/ipv4-unicast" {
     uses structure-neighbor-group-add-paths;
 
@@ -1366,4 +1387,14 @@ module frr-bgp {
 
     uses structure-neighbor-group-filter-config;
   }
+
+  augment "/frr-rt:routing/frr-rt:control-plane-protocols/frr-rt:control-plane-protocol/bgp/peer-groups/peer-group/afi-safis/afi-safi/linkstate-linkstate" {
+    uses structure-neighbor-route-reflector;
+
+    uses structure-neighbor-route-server;
+
+    uses structure-neighbor-group-soft-reconfiguration;
+
+    uses structure-neighbor-group-filter-config;
+  }
 }
diff --git a/yang/frr-routing.yang b/yang/frr-routing.yang
index b304c241a4..f6e1f8e74a 100644
--- a/yang/frr-routing.yang
+++ b/yang/frr-routing.yang
@@ -172,6 +172,13 @@ module frr-routing {
   }
 
 
+  identity linkstate-linkstate {
+    base afi-safi-type;
+    description
+      "This identity represents the link-state address family.";
+  }
+
+
   identity control-plane-protocol {
     description
       "Base identity from which control-plane protocol identities are