diff --git a/addins/cvw-arch-verif b/addins/cvw-arch-verif
index 80cdee231..181354c2d 160000
--- a/addins/cvw-arch-verif
+++ b/addins/cvw-arch-verif
@@ -1 +1 @@
-Subproject commit 80cdee231f924b3045054594d4a7769e6eddcdcc
+Subproject commit 181354c2d497cc0deab023ead4162648f38ace91
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index ee811e922..7f68f7268 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -5,9 +5,11 @@
 // This file is needed in the config subdirectory for each config supporting coverage.
 // It defines which extensions are enabled for that config.
 
-`define COVER_RV64I
-`define COVER_RV64M
-`define COVER_RV64F
-`include "coverage/RV64I_coverage.svh"
-`include "coverage/RV64M_coverage.svh"
-`include "coverage/RV64F_coverage.svh"
+//`define COVER_RV64I
+// `define COVER_RV64M
+// `define COVER_RV64F
+`define COVER_RV64VM
+//`include "RV64I_coverage.svh"
+// `include "coverage/RV64M_coverage.svh"
+// `include "coverage/RV64F_coverage.svh"
+`include "RV64VM_coverage.svh"