diff --git a/BLOCKFILE b/BLOCKFILE
index e81e83ed71eba..81ea4c4201cf8 100644
--- a/BLOCKFILE
+++ b/BLOCKFILE
@@ -61,7 +61,6 @@ hw/ip/rv_core_ibex/rtl/*
 hw/ip/rv_dm/rtl/*
 hw/ip/rv_timer/rtl/*
 hw/ip/spi_device/rtl/*
-hw/ip/spi_host/rtl/*
 hw/ip/sram_ctrl/rtl/*
 hw/ip/sysrst_ctrl/rtl/*
 hw/ip/tlul/rtl/*
@@ -117,6 +116,7 @@ hw/top_earlgrey/ip_autogen/pinmux/data/pinmux.hjson
 hw/top_earlgrey/ip_autogen/pwrmgr/data/pwrmgr.hjson
 hw/top_earlgrey/ip_autogen/rstmgr/data/rstmgr.hjson
 hw/top_earlgrey/ip_autogen/rv_plic/data/rv_plic.hjson
+hw/top_earlgrey/ip_autogen/spi_host/data/spi_host.hjson
 
 hw/top_earlgrey/data/top_earlgrey.hjson
 hw/top_earlgrey/data/xbar_main.hjson
diff --git a/util/mdbook_dashboard.py b/util/mdbook_dashboard.py
index bb7742af5cf46..8626a91d40d7b 100755
--- a/util/mdbook_dashboard.py
+++ b/util/mdbook_dashboard.py
@@ -41,7 +41,6 @@
         REPO_TOP / "hw/ip/rv_dm/data/rv_dm.hjson",
         REPO_TOP / "hw/ip/rv_core_ibex/data/rv_core_ibex.hjson",
         REPO_TOP / "hw/ip/rv_timer/data/rv_timer.hjson",
-        REPO_TOP / "hw/ip/spi_host/data/spi_host.hjson",
         REPO_TOP / "hw/ip/spi_device/data/spi_device.hjson",
         REPO_TOP / "hw/ip/sram_ctrl/data/sram_ctrl.hjson",
         REPO_TOP / "hw/ip/sysrst_ctrl/data/sysrst_ctrl.hjson",
@@ -69,6 +68,10 @@
             REPO_TOP / "hw/top_earlgrey/ip_autogen/rstmgr/data/rstmgr.hjson",
             REPO_TOP / "hw/top_earlgrey/ip_autogen/rstmgr/",
         ),
+        (
+            REPO_TOP / "hw/top_earlgrey/ip_autogen/spi_host/data/spi_host.hjson",
+            REPO_TOP / "hw/top_earlgrey/ip_autogen/spi_host/",
+        ),
         REPO_TOP / "hw/top_earlgrey/ip_autogen/alert_handler/data/alert_handler.hjson",
         REPO_TOP / "hw/top_earlgrey/ip/sensor_ctrl/data/sensor_ctrl.hjson",
         REPO_TOP / "hw/top_earlgrey/ip_autogen/rv_plic/data/rv_plic.hjson",
diff --git a/util/site/blocks.json b/util/site/blocks.json
index f6cfed227137c..0b523eac2fb58 100644
--- a/util/site/blocks.json
+++ b/util/site/blocks.json
@@ -74,16 +74,6 @@
         "data_file": "hw/ip/entropy_src/data/entropy_src.hjson",
         "report": "/hw/ip/entropy_src/dv"
     },
-    "spi-host-0": {
-        "name": "SPI Host",
-        "data_file": "hw/ip/spi_host/data/spi_host.hjson",
-        "report": "/hw/ip/spi_host/dv"
-    },
-    "spi-host-1": {
-        "name": "SPI Host",
-        "data_file": "hw/ip/spi_host/data/spi_host.hjson",
-        "report": "/hw/ip/spi_host/dv"
-    },
     "usb": {
         "name": "USB",
         "data_file": "hw/ip/usbdev/data/usbdev.hjson",
diff --git a/util/site/fetch_block_stats.py b/util/site/fetch_block_stats.py
index 560f04ce0daa8..0c937eb2226eb 100755
--- a/util/site/fetch_block_stats.py
+++ b/util/site/fetch_block_stats.py
@@ -43,8 +43,8 @@
     "debug-module": "hw/ip/rv_dm/dv/2024.01.22_11.06.19/",
     "timers": "hw/ip/rv_timer/dv/2024.01.22_11.07.05/",
     "spi-device": "hw/ip/spi_device/dv/2024.01.22_11.09.05/",
-    "spi-host-0": "hw/ip/spi_host/dv/2024.01.22_11.07.40/",
-    "spi-host-1": "hw/ip/spi_host/dv/2024.01.22_11.07.40/",
+    "spi-host-0": "hw/top_earlgrey/ip_autogen/spi_host/dv/2024.01.22_11.07.40/",
+    "spi-host-1": "hw/top_earlgrey/ip_autogen/spi_host/dv/2024.01.22_11.07.40/",
     "main-sram": "hw/ip/sram_ctrl_main/dv/2024.01.22_11.10.19/",
     "retention-sram": "hw/ip/sram_ctrl_ret/dv/2024.01.22_11.11.17/",
     "sysrst-controller": "hw/ip/sysrst_ctrl/dv/2024.01.22_11.12.25/",