diff --git a/yang/frr-bgp-neighbor.yang b/yang/frr-bgp-neighbor.yang
index d6688eed29..03af643ba2 100644
--- a/yang/frr-bgp-neighbor.yang
+++ b/yang/frr-bgp-neighbor.yang
@@ -90,8 +90,6 @@ submodule frr-bgp-neighbor {
         "Don't send open messages to this neighbor.";
     }
 
-    uses structure-neighbor-group-capability-options;
-
     uses neighbor-update-source;
 
     uses structure-neighbor-group-ebgp-multihop;
diff --git a/yang/frr-bgp-peer-group.yang b/yang/frr-bgp-peer-group.yang
index 746ced30cc..80c9ecff2a 100644
--- a/yang/frr-bgp-peer-group.yang
+++ b/yang/frr-bgp-peer-group.yang
@@ -76,6 +76,8 @@ submodule frr-bgp-peer-group {
     uses neighbor-remote-as;
 
     uses neighbor-parameters;
+
+    uses structure-neighbor-group-capability-options;
   }
 
   grouping bgp-peer-group-list {
diff --git a/yang/frr-bgp.yang b/yang/frr-bgp.yang
index 264ad70d65..0e15195dd5 100644
--- a/yang/frr-bgp.yang
+++ b/yang/frr-bgp.yang
@@ -230,6 +230,8 @@ module frr-bgp {
           }
 
           uses neighbor-parameters;
+
+          uses structure-neighbor-group-capability-options;
         }
 
         list unnumbered-neighbor {
@@ -264,6 +266,12 @@ module frr-bgp {
           uses neighbor-remote-as;
 
           uses neighbor-parameters;
+
+          uses structure-neighbor-group-capability-options {
+            refine "frr-bgp:capability-options/extended-nexthop-capability" {
+              default "true";
+            }
+          }
         }
       }