diff --git a/.gitlab-ci/scripts/report_coverage.py b/.gitlab-ci/scripts/report_coverage.py
index 0de0a7b06..d9ad1ee42 100644
--- a/.gitlab-ci/scripts/report_coverage.py
+++ b/.gitlab-ci/scripts/report_coverage.py
@@ -28,7 +28,7 @@ def get_cc_scores(component):
 		if re.search(r'\b'+component+r'\b', l):
 			line = l
 	scores = pattern.findall(line)
-	return [float(score) for score in scores[0:4]]
+	return [float(score) for score in scores[0:3]]
 
 def get_fc_scores(component):
 	for l in fc_log.splitlines():
@@ -38,7 +38,7 @@ def get_fc_scores(component):
 	return [float(scores[0])]
 
 cc_components = [
-	"i_cva6",
+	"i_cva6_pipeline",
 	"commit_stage_i",
 	"controller_i",
 	"csr_regfile_i",
@@ -55,7 +55,7 @@ fc_components = [
 ]
 
 cc_score_metric = rb.TableMetric('Coverage results')
-cc_score_metric.add_value("COMPONENT", "SCORE", "LINE", "COND", "TOGGLE")
+cc_score_metric.add_value("COMPONENT", "SCORE", "LINE", "COND")
 for component in cc_components:
 	cc_scores = get_cc_scores(component)
 	cc_score_metric.add_value(component, *cc_scores)
@@ -66,7 +66,7 @@ for component in fc_components:
 	fc_scores = get_fc_scores(component)
 	fc_score_metric.add_value(component, *fc_scores)
 
-coverage_score = int(get_cc_scores("i_cva6")[0])
+coverage_score = int(get_cc_scores("i_cva6_pipeline")[0])
 report = rb.Report(f'{coverage_score}%')
 report.add_metric(cc_score_metric)
 report.add_metric(fc_score_metric)
diff --git a/verif/sim/cov-exclude-mod.lst b/verif/sim/cov-exclude-mod.lst
index 81ff71d78..02deab273 100644
--- a/verif/sim/cov-exclude-mod.lst
+++ b/verif/sim/cov-exclude-mod.lst
@@ -7,10 +7,10 @@
 //
 // Original Author: Zineb EL KACIMI (zineb.el-kacimi@external.thalesgroup.com)
 
-
--tree uvmt_cva6_tb.cva6_dut_wrap.cva6_tb_wrapper_i.i_cva6.instr_tracer_i
--tree uvmt_cva6_tb.cva6_dut_wrap.cva6_tb_wrapper_i.i_cva6.tracer_if
--tree uvmt_cva6_tb.cva6_dut_wrap.cva6_tb_wrapper_i.i_cva6.genblk6.i_cva6_rvfi_combi
--tree uvmt_cva6_tb.cva6_dut_wrap.cva6_tb_wrapper_i.i_cva6.i_cva6_rvfi_probes
--tree uvmt_cva6_tb.cva6_dut_wrap.cva6_tb_wrapper_i.i_cva6.i_frontend.i_instr_queue.i_unread_*
--tree uvmt_cva6_tb.cva6_dut_wrap.cva6_tb_wrapper_i.i_cva6.gen_cache_hpd.i_cache_subsystem
++moduletree cva6_pipeline
+-tree *.instr_tracer_i
+-tree *.tracer_if
+-tree *.i_cva6_rvfi_probes
+-tree *.i_frontend.i_instr_queue.i_unread_*
+-tree *.ex_stage_i.lsu_i.i_pmp_data_if*
+-tree *.issue_stage_i.i_issue_read_operands.gen_sel_clobbers[*].i_sel_gpr_clobbers