diff --git a/tools/etc/frr/support_bundle_commands.conf b/tools/etc/frr/support_bundle_commands.conf
index 6a21ae3fb584..a248a1a30424 100644
--- a/tools/etc/frr/support_bundle_commands.conf
+++ b/tools/etc/frr/support_bundle_commands.conf
@@ -165,29 +165,51 @@ CMD_LIST_END
 # PIM Support Bundle Command List
 PROC_NAME:pim
 CMD_LIST_START
-show ip multicast
-show ip pim interface
-show ip pim interface traffic
-show ip pim nexthop
-show ip pim neighbor
-show ip pim bsr
-show ip pim bsrp-info
-show ip pim bsm-database
-show ip pim rp-info
-show ip igmp groups
-show ip igmp interface
-show ip igmp join
+show ip igmp vrf all groups detail
+show ip igmp vrf all interface detail
+show ip igmp vrf all join
+show ip igmp vrf all join-group
+show ip igmp vrf all proxy
 show ip igmp sources
+show ip igmp vrf all static-group
 show ip igmp statistics
-show ip pim upstream
-show ip mroute
-show ip pim join
-show ip pim state
-show ip pim statistics
-show ip pim rpf
+
+show ip mroute vrf all
+show ip multicast vrf all
+
 show ip msdp vrf all mesh-group
 show ip msdp vrf all peer
 show ip msdp vrf all sa detail
+
+show ip pim vrf all autorp
+show ip pim bsm-database
+show ip pim bsr
+show ip pim bsr candidate-bsr
+show ip pim bsr candidate-rp
+show ip pim bsr candidate-rp-database
+show ip pim bsr groups
+show ip pim bsr rp-info
+show ip pim channel
+show ip pim group-type
+show ip pim vrf all interface detail
+show ip pim interface traffic
+show ip pim vrf all join
+show ip pim jp-agg
+show ip pim local-membership
+show ip pim mlag summary
+show ip pim mlag vrf all interface
+show ip pim vrf all mlag upstream
+show ip pim vrf all neighbor detail
+show ip pim nexthop
+show ip pim vrf all rp-info
+show ip pim vrf all rpf
+show ip pim secondary
+show ip pim vrf all state
+show ip pim statistics
+show ip pim vrf all upstream
+show ip pim upstream-join-desired
+show ip pim upstream-rpf
+show ip pim vxlan-groups
 CMD_LIST_END
 
 # OSPFv3 Support Bundle Command List
@@ -233,32 +255,37 @@ CMD_LIST_END
 #PIMv6 Support Bundle Command List
 PROC_NAME:pim6
 CMD_LIST_START
+show ipv6 mld vrf all interface detail
+show ipv6 mld vrf all statistics
+show ipv6 mld vrf all joins detail
+show ipv6 mld vrf all groups
+
+show ipv6 mroute vrf all
+show ipv6 multicast vrf all
+
+show ipv6 pim bsm-database
+show ipv6 pim bsr
+show ipv6 pim bsr candidate-bsr
+show ipv6 pim bsr candidate-rp
+show ipv6 pim bsr candidate-rp-database
+show ipv6 pim bsr groups
+show ipv6 pim bsr rp-info
 show ipv6 pim channel
-show ipv6 pim interface
+show ipv6 pim vrf all interface detail
 show ipv6 pim interface traffic
-show ipv6 pim join
-show ipv6 jp-agg
-show ipv6 pim nexthop
-show ipv6 pim nexthop-lookup
-show ipv6 pim neighbor
+show ipv6 pim vrf all join
+show ipv6 pim jp-agg
 show ipv6 pim local-membership
-show ipv6 pim rp-info
-show ipv6 pim rpf
+show ipv6 pim nexthop
+show ipv6 pim vrf all neighbor detail
+show ipv6 pim vrf all rp-info
+show ipv6 pim vrf all rpf
 show ipv6 pim secondary
-show ipv6 pim state
+show ipv6 pim vrf all state
 show ipv6 pim statistics
-show ipv6 pim upstream
+show ipv6 pim vrf all upstream
 show ipv6 pim upstream-join-desired
 show ipv6 pim upstream-rpf
-show ipv6 mld interface
-show ipv6 mld statistics
-show ipv6 mld joins
-show ipv6 mld groups
-show ipv6 multicast
-show ipv6 mroute
-show ipv6 pim bsr
-show ipv6 pim bsrp-info
-show ipv6 pim bsm-databases
 CMD_LIST_END
 
 #MGMT Support Bundle Command List