diff --git a/core/frontend/frontend.sv b/core/frontend/frontend.sv
index dea5ca0813..399e271ad6 100644
--- a/core/frontend/frontend.sv
+++ b/core/frontend/frontend.sv
@@ -455,7 +455,9 @@ module frontend import ariane_pkg::*; #(
     // we need to inspect up to INSTR_PER_FETCH instructions for branches
     // and jumps
     for (genvar i = 0; i < INSTR_PER_FETCH; i++) begin : gen_instr_scan
-      instr_scan i_instr_scan (
+      instr_scan #(
+        .CVA6Cfg      ( CVA6Cfg       )
+      ) i_instr_scan (
         .instr_i      ( instr[i]      ),
         .rvi_return_o ( rvi_return[i] ),
         .rvi_call_o   ( rvi_call[i]   ),
@@ -473,7 +475,9 @@ module frontend import ariane_pkg::*; #(
       );
     end
 
-    instr_queue i_instr_queue (
+    instr_queue #(
+      .CVA6Cfg             ( CVA6Cfg              )
+    ) i_instr_queue (
       .clk_i               ( clk_i                ),
       .rst_ni              ( rst_ni               ),
       .flush_i             ( flush_i              ),
diff --git a/core/pmp/src/pmp.sv b/core/pmp/src/pmp.sv
index 3eba803e17..6c8171eac0 100644
--- a/core/pmp/src/pmp.sv
+++ b/core/pmp/src/pmp.sv
@@ -38,6 +38,7 @@ module pmp #(
             assign conf_addr_prev = (i == 0) ? '0 : conf_addr_i[i-1];
 
             pmp_entry #(
+                .CVA6Cfg ( CVA6Cfg ),
                 .PLEN    ( PLEN    ),
                 .PMP_LEN ( PMP_LEN )
             ) i_pmp_entry(