diff --git a/hw/top_darjeeling/top_darjeeling.core b/hw/top_darjeeling/top_darjeeling.core
index 108548bbcb529c..e5dd6d24230087 100644
--- a/hw/top_darjeeling/top_darjeeling.core
+++ b/hw/top_darjeeling/top_darjeeling.core
@@ -17,7 +17,6 @@ filesets:
       - lowrisc:ip:rv_timer
       - lowrisc:ip:tlul
       - lowrisc:ip:spi_device
-      - lowrisc:ip:spi_host
       - lowrisc:ip:i2c
       - lowrisc:ip:pattgen
       - lowrisc:ip:aes
@@ -47,6 +46,7 @@ filesets:
       - lowrisc:opentitan:top_darjeeling_rv_plic
       - lowrisc:opentitan:top_darjeeling_pinmux
       - lowrisc:opentitan:top_darjeeling_pwrmgr
+      - lowrisc:opentitan:top_darjeeling_spi_host
       - lowrisc:ip:aon_timer
       - lowrisc:ip:adc_ctrl
       - lowrisc:ip:sysrst_ctrl
diff --git a/hw/top_earlgrey/top_earlgrey.core b/hw/top_earlgrey/top_earlgrey.core
index 49a1a40993ccf8..6b937b19c0dc52 100644
--- a/hw/top_earlgrey/top_earlgrey.core
+++ b/hw/top_earlgrey/top_earlgrey.core
@@ -17,7 +17,6 @@ filesets:
       - lowrisc:ip:rv_timer
       - lowrisc:ip:tlul
       - lowrisc:ip:spi_device
-      - lowrisc:ip:spi_host
       - lowrisc:ip:i2c
       - lowrisc:ip:pattgen
       - lowrisc:ip:pwm
@@ -47,6 +46,7 @@ filesets:
       - lowrisc:opentitan:top_earlgrey_rv_plic
       - lowrisc:opentitan:top_earlgrey_pinmux
       - lowrisc:opentitan:top_earlgrey_pwrmgr
+      - lowrisc:opentitan:top_earlgrey_spi_host
       - lowrisc:ip:aon_timer
       - lowrisc:ip:adc_ctrl
       - lowrisc:ip:sysrst_ctrl
diff --git a/hw/top_englishbreakfast/top_englishbreakfast.core b/hw/top_englishbreakfast/top_englishbreakfast.core
index 85fccf606cc4e9..4e5b605893d7cc 100644
--- a/hw/top_englishbreakfast/top_englishbreakfast.core
+++ b/hw/top_englishbreakfast/top_englishbreakfast.core
@@ -24,7 +24,6 @@ filesets:
       - lowrisc:ip:gpio
       - lowrisc:ip:rv_timer
       - lowrisc:ip:spi_device
-      - lowrisc:ip:spi_host
       - lowrisc:ip:aes
       - lowrisc:ip:entropy_src
       - lowrisc:ip:hmac
@@ -41,6 +40,7 @@ filesets:
       - lowrisc:opentitan:top_englishbreakfast_pwrmgr
       - lowrisc:opentitan:top_englishbreakfast_rstmgr
       - lowrisc:opentitan:top_englishbreakfast_rv_plic
+      - lowrisc:opentitan:top_englishbreakfast_spi_host
       - lowrisc:ip:rom_ctrl
       - lowrisc:ip:aon_timer