diff --git a/include/ariane_pkg.sv b/include/ariane_pkg.sv
index 91b38513fe679a00537f1cf3beec4d2d0a953f45..44c993afda9fe7cb91c67ef36fcdb1a17f6629cd 100644
--- a/include/ariane_pkg.sv
+++ b/include/ariane_pkg.sv
@@ -128,7 +128,7 @@ package ariane_pkg;
     endfunction : is_inside_cacheable_regions
 
     // TODO: Slowly move those parameters to the new system.
-    localparam NR_SB_ENTRIES = 8; // number of scoreboard entries
+    localparam NR_SB_ENTRIES = 2; // number of scoreboard entries
     localparam TRANS_ID_BITS = $clog2(NR_SB_ENTRIES); // depending on the number of scoreboard entries we need that many bits
                                                       // to uniquely identify the entry in the scoreboard
     localparam ASID_WIDTH    = (riscv::XLEN == 64) ? 16 : 1;
diff --git a/src/ariane.sv b/src/ariane.sv
index cfd985050ed06ac63603e2a6167e5155b1e0cb15..182b99d02af8c594bc12788736899084a48d6d4b 100644
--- a/src/ariane.sv
+++ b/src/ariane.sv
@@ -695,7 +695,7 @@ module ariane import ariane_pkg::*; #(
     .icache_areq_o         ( icache_areq_cache_ex        ),
     .icache_dreq_i         ( icache_dreq_if_cache        ),
     .icache_dreq_o         ( icache_dreq_cache_if        ),
-    .icache_stall_i        ( icache_stall_ctrl           ),
+    .icache_stall_i        ( 1'b0                        ),
     // D$
     .dcache_enable_i       ( dcache_en_csr_nbdcache      ),
     .dcache_flush_i        ( dcache_flush_ctrl_cache     ),