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
@@ -1,14 +1,14 @@
 <!-- include start from bgp-peer-group.xml.i -->
 <leafNode name="peer-group">
   <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>
       <description>Peer-group name</description>
     </valueHelp>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/src/completion/list_bgp_peer_groups.sh b/src/completion/list_bgp_peer_groups.sh
deleted file mode 100755
index 1684271f8..000000000
--- a/src/completion/list_bgp_peer_groups.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2021 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Return BGP peer-groups from CLI
-
-declare -a vals
-eval "vals=($(cli-shell-api listNodes protocols bgp peer-group))"
-
-echo -n ${vals[@]}
-exit 0