diff --git a/core/Flist.cva6 b/core/Flist.cva6
index 75133d5920..3881281736 100644
--- a/core/Flist.cva6
+++ b/core/Flist.cva6
@@ -155,14 +155,14 @@ ${CVA6_REPO_DIR}/core/cache_subsystem/cache_ctrl.sv
 ${CVA6_REPO_DIR}/core/cache_subsystem/cva6_icache_axi_wrapper.sv
 ${CVA6_REPO_DIR}/core/cache_subsystem/std_cache_subsystem.sv
 ${CVA6_REPO_DIR}/core/cache_subsystem/std_nbdcache.sv
-${CVA6_REPO_DIR}/core/cache_subsystem/cva6_hpdcache_params_pkg.sv
+//${CVA6_REPO_DIR}/core/cache_subsystem/cva6_hpdcache_params_pkg.sv
 //-F ${HPDCACHE_DIR}/rtl/hpdcache.Flist
 //${CVA6_REPO_DIR}/core/cache_subsystem/cva6_hpdcache_subsystem.sv
 //${CVA6_REPO_DIR}/core/cache_subsystem/cva6_hpdcache_subsystem_axi_arbiter.sv
 //${CVA6_REPO_DIR}/core/cache_subsystem/cva6_hpdcache_if_adapter.sv
-${HPDCACHE_DIR}/rtl/src/common/macros/behav/hpdcache_sram_1rw.sv
-${HPDCACHE_DIR}/rtl/src/common/macros/behav/hpdcache_sram_wbyteenable_1rw.sv
-${HPDCACHE_DIR}/rtl/src/common/macros/behav/hpdcache_sram_wmask_1rw.sv
+//${HPDCACHE_DIR}/rtl/src/common/macros/behav/hpdcache_sram_1rw.sv
+//${HPDCACHE_DIR}/rtl/src/common/macros/behav/hpdcache_sram_wbyteenable_1rw.sv
+//${HPDCACHE_DIR}/rtl/src/common/macros/behav/hpdcache_sram_wmask_1rw.sv
 
 // Physical Memory Protection
 // NOTE: pmp.sv modified for DSIM (unchanged for other simulators)