diff --git a/.gitmodules b/.gitmodules
index 5a1e8d4dc..672ec445f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,9 +26,6 @@
 	path = addins/cvw-arch-verif
 	url = https://github.com/openhwgroup/cvw-arch-verif
 	ignore = dirty
-[submodule "addins/riscvISACOV"]
-	path = addins/riscvISACOV
-	url = https://github.com/riscv-verification/riscvISACOV.git
 [submodule "addins/berkeley-softfloat-3"]
 	path = addins/berkeley-softfloat-3
 	url = https://github.com/ucb-bar/berkeley-softfloat-3.git
diff --git a/addins/cvw-arch-verif b/addins/cvw-arch-verif
index 812f30af7..d6bae481c 160000
--- a/addins/cvw-arch-verif
+++ b/addins/cvw-arch-verif
@@ -1 +1 @@
-Subproject commit 812f30af765c0a692c506e42493f494278c00fe0
+Subproject commit d6bae481c784461a2d2be14325041ea284319098
diff --git a/addins/riscvISACOV b/addins/riscvISACOV
deleted file mode 160000
index ac9fa2d38..000000000
--- a/addins/riscvISACOV
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac9fa2d386c0cb2f44e1e1e83a555d585034dfa3
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 6f613c404..f42bf4930 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -110,9 +110,8 @@ if {[lcheck lst "--fcov"]} {
          set FCvlog "+define+INCLUDE_TRACE2COV \
                 +define+IDV_INCLUDE_TRACE2COV \
                 +define+COVER_BASE_RV32I \
-                +incdir+$env(WALLY)/addins/riscvISACOV/source \
+                +incdir+$env(WALLY)/addins/cvw-arch-verif/riscvISACOV/source \
 		"
-   
     set FCvopt "+TRACE2COV_ENABLE=1 +IDV_TRACE2COV=1"
 
 }