diff --git a/Bender.yml b/Bender.yml
index 8273894a..78b4c4cf 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -49,8 +49,6 @@ sources:
     files:
       - /users/micas/shares/project_snax/tapeout_modules/hemaia/tc_sram_impl.sv
 
-  # future
-  - hw/future/reg_to_apb.sv
   # spm_interface
   - files:
       # Level 1
diff --git a/hw/occamy/occamy_chip.sv.tpl b/hw/occamy/occamy_chip.sv.tpl
index b8b2c40b..4282db9a 100644
--- a/hw/occamy/occamy_chip.sv.tpl
+++ b/hw/occamy/occamy_chip.sv.tpl
@@ -168,6 +168,8 @@ import ${name}_pkg::*;
     .bootrom_rsp_i (bootrom_axi_lite_rsp),
     .spm_axi_wide_req_o (ram_axi_req),
     .spm_axi_wide_rsp_i (ram_axi_rsp),
+    .chip_ctrl_req_o (),
+    .chip_ctrl_rsp_i ('0),
     .ext_irq_i ('0)
   );
 
diff --git a/hw/occamy/occamy_soc.sv.tpl b/hw/occamy/occamy_soc.sv.tpl
index 8382f028..bcafb0de 100644
--- a/hw/occamy/occamy_soc.sv.tpl
+++ b/hw/occamy/occamy_soc.sv.tpl
@@ -191,6 +191,7 @@ module ${name}_soc
     .clk_i (${narrow_spm_mst.clk}),
     .rst_ni (${narrow_spm_mst.rst}),
     .busy_o (),
+    .test_i (test_mode_i),
     .axi_req_i (${narrow_spm_mst.req_name()}),
     .axi_resp_o (${narrow_spm_mst.rsp_name()}),
     .mem_req_o (spm_narrow_req),
@@ -349,6 +350,7 @@ module ${name}_soc
     .clk_i,
     .rst_ni,
     .dma_id_i         ( 'd0                           ),
+    .chip_id_i        ( '0                            ),
     .axi_dma_req_o    ( ${in_sys_idma_mst.req_name()} ),
     .axi_dma_res_i    ( ${in_sys_idma_mst.rsp_name()} ),
     .burst_req_i      ( idma_burst_req                ),
diff --git a/target/rtl/test/testharness.sv.tpl b/target/rtl/test/testharness.sv.tpl
index a426875e..77a60adf 100644
--- a/target/rtl/test/testharness.sv.tpl
+++ b/target/rtl/test/testharness.sv.tpl
@@ -124,6 +124,8 @@ module testharness import occamy_pkg::*; (
     .bootrom_rsp_i (axi_lite_bootrom_rsp),
     .spm_axi_wide_req_o (spm_wide_req),
     .spm_axi_wide_rsp_i (spm_wide_rsp),
+    .chip_ctrl_req_o (),
+    .chip_ctrl_rsp_i ('0),
     .ext_irq_i ('0)
     );