3 files changed, 34 insertions, 2 deletions
diff --git a/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i b/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i
new file mode 100644
index 000000000..caf0b6b31
--- /dev/null
+++ b/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from bgp/bgp-afi-l2vpn-advertise.xml.i -->
+<node name="unicast">
+  <properties>
+    <help>IPv4 address family</help>
+  </properties>
+  <children>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/bgp-common-config.xml.i
index c89e2288e..813da097c 100644
--- a/interface-definitions/include/bgp/bgp-common-config.xml.i
+++ b/interface-definitions/include/bgp/bgp-common-config.xml.i
@@ -215,6 +215,29 @@
         <help>L2VPN EVPN BGP settings</help>
       </properties>
       <children>
+        <node name="advertise">
+          <properties>
+            <help>Advertise prefix routes</help>
+          </properties>
+          <children>
+            <node name="ipv4">
+              <properties>
+                <help>IPv4 address family</help>
+              </properties>
+              <children>
+                #include <include/bgp/bgp-afi-l2vpn-advertise.xml.i>
+              </children>
+            </node>
+            <node name="ipv6">
+              <properties>
+                <help>IPv6 address family</help>
+              </properties>
+              <children>
+                #include <include/bgp/bgp-afi-l2vpn-advertise.xml.i>
+              </children>
+            </node>
+          </children>
+        </node>
         <leafNode name="advertise-all-vni">
           <properties>
             <help>Advertise All local VNIs</help>
@@ -824,7 +847,6 @@
     #include <include/bgp/bgp-update-source.xml.i>
   </children>
 </tagNode>
-#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>BGP protocol timers</help>
diff --git a/interface-definitions/include/bgp/bgp-peer-group.xml.i b/interface-definitions/include/bgp/bgp-peer-group.xml.i
index 8fc50794d..77dab4a8b 100644
--- a/interface-definitions/include/bgp/bgp-peer-group.xml.i
+++ b/interface-definitions/include/bgp/bgp-peer-group.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Peer group for this peer</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_bgp_peer_groups.sh</script>
+      <path>protocols bgp peer-group</path>
     </completionHelp>
     <valueHelp>
       <format>txt</format>