diff --git a/scripts/generate_dump b/scripts/generate_dump
index 334e3573af..849462fd36 100755
--- a/scripts/generate_dump
+++ b/scripts/generate_dump
@@ -694,6 +694,23 @@ save_bgp_info() {
     save_vtysh "show bgp ipv6 summary" "bgp.ipv6.summary"
     save_vtysh "show bgp ipv6 neighbors" "bgp.ipv6.neighbors"
     save_vtysh "show bgp ipv6" "bgp.ipv6.table"
+    save_vtysh "show ip bgp vrf all" "bgp.vrf.all"
+    save_vtysh "show ip bgp vrf all summary json" "bgp.vrf.all.summary.json"
+    save_vtysh "show ip bgp vrf all neighbors json" "bgp.vrf.all.neigh.json"
+    save_vtysh "show ip bgp vrf all nexthop" "bgp.vrf.all.nexthop"
+    save_vtysh "show ip bgp vrf all update-group" "bgp.vrf.all.nexthop"
+    save_vtysh "show bgp vrfs json" "bgp.vrf.json"
+    save_vtysh "show bgp vrf all ipv4 unicast summary json" "bgp.vrf.all.ipv4uc.summary.json"
+    save_vtysh "show bgp vrf all ipv6 unicast summary json" "bgp.vrf.all.ipv6uc.summary.json"
+    save_vtysh "show bgp vrf all ipv4 unicast detail json" "bgp.vrf.all.ipv4uc.detail.json"
+    save_vtysh "show bgp vrf all ipv6 unicast detail json" "bgp.vrf.all.ipv6uc.detail.json"
+    save_vtysh "show bgp vrf all ipv4 unicast update-group" "bgp.vrf.all.ipv4uc.update_group"
+    save_vtysh "show bgp vrf all ipv6 unicast update-group" "bgp.vrf.all.ipv6uc.update_group"
+    save_vtysh "show bgp vrf all ipv4 unicast route-leak json" "bgp.vrf.all.ipv4uc.route_leak.json"
+    save_vtysh "show bgp vrf all ipv6 unicast route-leak json" "bgp.vrf.all.ipv6uc.route_leak.json"
+    save_vtysh "show bgp ipv4 labeled-unicast" "bgp.ipv4.labeled_unicast"
+    save_vtysh "show bgp ipv6 labeled-unicast" "bgp.ipv6.labeled_unicast"
+    save_vtysh "show bgp mac hash" "bgp.mac.hash"
     save_bgp_neighbor_all_ns
 }
 
@@ -709,9 +726,25 @@ save_bgp_info() {
 save_evpn_info() {
     trap 'handle_error $? $LINENO' ERR
     save_vtysh "show bgp l2vpn evpn" "bgp.l2vpn.evpn"
-    save_vtysh "show bgp l2vpn evpn route detail" "bgp.evpn.route"
-    save_vtysh "show evpn vni detail" "bgp.evpn.vni"
-    save_vtysh "show evpn arp-cache vni all" "bgp.evpn.arp"
+    save_vtysh "show bgp l2vpn evpn summary json" "bgp.evpn.summary.json"
+    save_vtysh "show bgp l2vpn evpn route" "bgp.evpn.route"
+    save_vtysh "show bgp l2vpn evpn route detail" "bgp.evpn.route.detail"
+    save_vtysh "show bgp l2vpn evpn vni json" "bgp.evpn.vni.json"
+    save_vtysh "show bgp l2vpn evpn import-rt json" "bgp.evpn.import-rt.json"
+    save_vtysh "show bgp l2vpn evpn vrf-import-rt json" "bgp.evpn.vrf_import-rt.json"
+    save_vtysh "show bgp l2vpn evpn update-groups" "bgp.evpn.update_groups"
+    save_vtysh "show bgp l2vpn evpn next-hops json" "bgp.evpn.next_hops.json"
+    save_vtysh "show bgp vni all" "bgp.vni.all"
+    save_vtysh "show bgp vni all detail" "bgp.vni.all.detail"
+    save_vtysh "show evpn vni detail json" "evpn.vni.json"
+    save_vtysh "show evpn access-vlan json" "evpn.access_vlan.json"
+    save_vtysh "show evpn arp-cache vni all" "evpn.arp"
+    save_vtysh "show evpn json" "evpn.json"
+    save_vtysh "show evpn l2-nh json" "evpn.l2_nh.json"
+    save_vtysh "show evpn mac vni all" "evpn.mac.vni"
+    save_vtysh "show evpn arp-cache vni all" "evpn.arp_cache.vni"
+    save_vtysh "show evpn rmac vni all json" "evpn.rmac.vni.json"
+    save_vtysh "show evpn next-hops vni all json" "evpn.next_hops.vni.json"
     save_bgp_evpn_neighbor_all_ns
 }
 ###############################################################################
@@ -726,12 +759,31 @@ save_evpn_info() {
 save_frr_info() {
     trap 'handle_error $? $LINENO' ERR
     save_vtysh "show running-config" "frr.running_config"
-    save_vtysh "show ip route vrf all" "frr.ip_route"
-    save_vtysh "show ipv6 route vrf all" "frr.ip6_route"
+    save_vtysh "show ip route vrf all nexthop-group" "frr.ip_route.nhg"
+    save_vtysh "show ipv6 route vrf all nexthop-group" "frr.ip6_route.nhg"
     save_vtysh "show zebra fpm stats" "frr.fpm.stats"
     save_vtysh "show zebra dplane detailed" "frr.dplane"
     save_vtysh "show interface vrf all" "frr.interfaces"
-    save_vtysh "show zebra client summary" "frr.client"
+    save_vtysh "show zebra" "frr.zebra"
+    save_vtysh "show zebra client" "frr.zebra.client"
+    save_vtysh "show zebra client summary" "frr.zebra.client.summary"
+    save_vtysh "show zebra router table summary" "frr.zebra.router.table.summary"
+    save_vtysh "show vrf" "frr.vrf"
+    save_vtysh "show vrf vni" "frr.vrf.vni"
+    save_vtysh "show ip nht vrf all" "frr.ip.nht.vrf.all"
+    save_vtysh "show ipv6 nht vrf all" "frr.ipv6.nht.vrf.all"
+    save_vtysh "show mpls table" "frr.mpls.table"
+    save_vtysh "show mpls fec" "frr.mpls.fec"
+    save_vtysh "show nexthop-group rib" "frr.nhg.rib"
+    save_vtysh "show thread cpu" "frr.thread_cpu"
+    save_vtysh "show thread poll" "frr.thread_poll"
+    save_vtysh "show debugging hashtable" "frr.debugging_hashtable"
+    save_vtysh "show work-queues" "frr.work_queues"
+    save_vtysh "show memory" "frr.memory"
+    save_vtysh "show modules" "frr.modules"
+    save_vtysh "show version" "frr.version"
+    save_vtysh "show debugging" "frr.debugging"
+    save_vtysh "show logging" "frr.logging"
 }
 
 ###############################################################################