diff --git a/hardware/scripts/wave_ara.tcl b/hardware/scripts/wave_ara.tcl
index 0af944d02..999d72b33 100644
--- a/hardware/scripts/wave_ara.tcl
+++ b/hardware/scripts/wave_ara.tcl
@@ -9,6 +9,9 @@ add wave -noupdate -group Ara -group core /ara_tb/dut/i_ara_soc/i_system/i_ara/*
 
 add wave -noupdate -group Ara -group dispatcher /ara_tb/dut/i_ara_soc/i_system/i_ara/i_dispatcher/*
 add wave -noupdate -group Ara -group sequencer /ara_tb/dut/i_ara_soc/i_system/i_ara/i_sequencer/*
+add wave -noupdate -group Ara -group xif_handler -position insertpoint sim:/ara_tb/dut/i_ara_soc/i_system/i_ara/i_xif_handler/*
+add wave -noupdate -group Ara -group xif_pre_decoder -position insertpoint sim:/ara_tb/dut/i_ara_soc/i_system/i_ara/i_xif_handler/i_xif_issue_pre_decoder/*
+add wave -noupdate -group Ara -group xif_buffer -position insertpoint sim:/ara_tb/dut/i_ara_soc/i_system/i_ara/i_xif_handler/i_xif_buffer/*
 
 # Add waves from all the lanes
 for {set lane 0}  {$lane < [examine -radix dec ara_tb.NrLanes]} {incr lane} {