diff --git a/tools/etc/frr/support_bundle_commands.conf b/tools/etc/frr/support_bundle_commands.conf
index 1eed65aec8..b3889e8784 100644
--- a/tools/etc/frr/support_bundle_commands.conf
+++ b/tools/etc/frr/support_bundle_commands.conf
@@ -80,9 +80,9 @@ show vrf
 show work-queues
 show debugging hashtable
 show running-config
-show thread cpu
-show thread poll
-show thread timers
+show event cpu
+show event poll
+show event timers
 show daemons
 show version
 CMD_LIST_END
@@ -177,7 +177,7 @@ CMD_LIST_END
 PROC_NAME:ospf6
 CMD_LIST_START
 show ipv6 ospf6 vrf all
-show ipv6 ospf6 vrfs 
+show ipv6 ospf6 vrfs
 show ipv6 ospf6 vrf all border-routers
 show ipv6 ospf6 vrf all border-routers detail
 show ipv6 ospf6 vrf all database