diff --git a/hw/ip/BUILD b/hw/ip/BUILD
index d3d407fe1cab1c..bc605d946b18cf 100644
--- a/hw/ip/BUILD
+++ b/hw/ip/BUILD
@@ -32,7 +32,6 @@ filegroup(
         "//hw/ip/rv_dm:all_files",
         "//hw/ip/rv_timer:all_files",
         "//hw/ip/spi_device:all_files",
-        "//hw/ip/spi_host:all_files",
         "//hw/ip/sram_ctrl:all_files",
         "//hw/ip/sysrst_ctrl:all_files",
         "//hw/ip/tlul:all_files",
diff --git a/sw/device/lib/dif/BUILD b/sw/device/lib/dif/BUILD
index a5dd7ee9b5c12a..18ab1b204d95b3 100644
--- a/sw/device/lib/dif/BUILD
+++ b/sw/device/lib/dif/BUILD
@@ -1112,7 +1112,7 @@ cc_library(
     ],
     deps = [
         ":base",
-        "//hw/ip/spi_host/data:spi_host_c_regs",
+        "//hw/top_earlgrey/ip_autogen/spi_host:spi_host_c_regs",
         "//sw/device/lib/base:bitfield",
         "//sw/device/lib/base:macros",
         "//sw/device/lib/base:memory",
diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index 647313fab7b042..9fe3e3afe6d15c 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -455,7 +455,6 @@ opentitan_test(
     deps = [
         "//hw/ip/i2c/data:i2c_c_regs",
         "//hw/ip/spi_device/data:spi_device_c_regs",
-        "//hw/ip/spi_host/data:spi_host_c_regs",
         "//hw/ip/usbdev/data:usbdev_c_regs",
         "//hw/top_earlgrey:alert_handler_c_regs",
         "//hw/top_earlgrey/sw/autogen:top_earlgrey",
@@ -3598,7 +3597,6 @@ opentitan_test(
     deps = [
         "//hw/ip/i2c/data:i2c_c_regs",
         "//hw/ip/spi_device/data:spi_device_c_regs",
-        "//hw/ip/spi_host/data:spi_host_c_regs",
         "//hw/ip/usbdev/data:usbdev_c_regs",
         "//hw/top_earlgrey/sw/autogen:top_earlgrey",
         "//sw/device/lib/arch:device",
@@ -5041,7 +5039,6 @@ opentitan_test(
         "//hw/ip/kmac/data:kmac_c_regs",
         "//hw/ip/pattgen/data:pattgen_c_regs",
         "//hw/ip/pwm/data:pwm_c_regs",
-        "//hw/ip/spi_host/data:spi_host_c_regs",
         "//hw/ip/uart/data:uart_c_regs",
         "//hw/top_earlgrey/sw/autogen:top_earlgrey",
         "//sw/device/lib/base:math",
diff --git a/sw/device/tock/BUILD b/sw/device/tock/BUILD
index 8bd2cc8ea0e8f2..c2718950e2b57c 100644
--- a/sw/device/tock/BUILD
+++ b/sw/device/tock/BUILD
@@ -29,7 +29,6 @@ filegroup(
         "//hw/ip/rv_core_ibex/data:rv_core_ibex_rust_regs",
         "//hw/ip/rv_timer/data:rv_timer_rust_regs",
         "//hw/ip/spi_device/data:spi_device_rust_regs",
-        "//hw/ip/spi_host/data:spi_host_rust_regs",
         "//hw/ip/sram_ctrl/data:sram_ctrl_rust_regs",
         "//hw/ip/sysrst_ctrl/data:sysrst_ctrl_rust_regs",
         "//hw/ip/uart/data:uart_rust_regs",
@@ -50,6 +49,7 @@ filegroup(
         "//hw/top_earlgrey/ip_autogen/pinmux:pinmux_rust_regs",
         "//hw/top_earlgrey/ip_autogen/pwrmgr:pwrmgr_rust_regs",
         "//hw/top_earlgrey/ip_autogen/rstmgr:rstmgr_rust_regs",
+        "//hw/top_earlgrey/ip_autogen/spi_host:spi_host_rust_regs",
     ],
     output_group = "tock",
 )