diff --git a/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_debug_waiver.do b/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_debug_waiver.do
index 1fc6fb73d3..14f406de24 100644
--- a/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_debug_waiver.do
+++ b/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_debug_waiver.do
@@ -1,6 +1,6 @@
-coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_dbg_req_at_xpulp_instr/<dbg_req_active,cv_elw_pi_ri,not_match>}         -comment {note: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
-coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_dbg_req_at_xpulp_instr/<dbg_req_0_to_1,cv_elw_pi_ri,not_match>}         -comment {note: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
-coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_trigger_with_xpulp_instr/<not_match,trig_en,cv_elw_pi_ri>}              -comment {note: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
-coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_trigger_with_xpulp_instr/<match,trig_en,cv_elw_pi_ri>}                  -comment {note: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
-coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_dbg_single_step_xpulp_instr/<dbg_step_mode_set,cv_elw_pi_ri,not_match>} -comment {note: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
-coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_xpulp_instructions_in_dbg_mode/<in_debug_mode,cv_elw_pi_ri>}            -comment {note: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_dbg_req_at_xpulp_instr/<dbg_req_active,cv_elw_pi_ri,not_match>}         -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_dbg_req_at_xpulp_instr/<dbg_req_0_to_1,cv_elw_pi_ri,not_match>}         -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_trigger_with_xpulp_instr/<not_match,trig_en,cv_elw_pi_ri>}              -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_trigger_with_xpulp_instr/<match,trig_en,cv_elw_pi_ri>}                  -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_dbg_single_step_xpulp_instr/<dbg_step_mode_set,cv_elw_pi_ri,not_match>} -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath {/uvme_cv32e40p_pkg/uvme_debug_covg/cg_debug_with_xpulp_inst/\/uvme_cv32e40p_pkg::uvme_debug_covg::cg_debug_with_xpulp_inst /cr_xpulp_instructions_in_dbg_mode/<in_debug_mode,cv_elw_pi_ri>}            -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
diff --git a/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_interrupt_waiver.do b/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_interrupt_waiver.do
index 62b44a073d..8fe5d0ed19 100644
--- a/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_interrupt_waiver.do
+++ b/cv32e40p/sim/tools/vsim/exclusion/cv32e40pv2_func_uvme_interrupt_waiver.do
@@ -34,3 +34,8 @@ coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_wfi_ex
 coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_wfi_exit/cp_insn_list/cv_setupi1 -comment {exclude wfi coverage for hwloop usecase}
 coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_wfi_exit/cp_insn_list/cv_setup1  -comment {exclude wfi coverage for hwloop usecase}
 
+# for cv_elw_pi_ri
+coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_irq_entry/cg_irq_entry/cp_insn_list/cv_elw_pi_ri  -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_irq_exit/cg_irq_exit/cp_insn_list/cv_elw_pi_ri    -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_wfi_entry/cg_wfi_entry/cp_insn_list/cv_elw_pi_ri  -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}
+coverage exclude -cvgpath /uvme_cv32e40p_pkg/uvme_interrupt_covg_v2__1/cg_wfi_exit/cg_wfi_exit/cp_insn_list/cv_elw_pi_ri    -comment {fixme: this waiver is not applicable for pulp_cluster config. elw is currently not tested thoroughly in non-cluster config tb}