diff --git a/config/coreboot-msi_z690a_ddr4.config b/config/coreboot-msi_z690a_ddr4.config
index c60699b0d..e9787a4da 100644
--- a/config/coreboot-msi_z690a_ddr4.config
+++ b/config/coreboot-msi_z690a_ddr4.config
@@ -159,8 +159,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=29
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
diff --git a/config/coreboot-msi_z690a_ddr4.config_defconfig b/config/coreboot-msi_z690a_ddr4.config_defconfig
index e31e86b37..08fac8b0a 100644
--- a/config/coreboot-msi_z690a_ddr4.config_defconfig
+++ b/config/coreboot-msi_z690a_ddr4.config_defconfig
@@ -5,8 +5,8 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_MSI_Z690_A_PRO_WIFI_DDR4=y
diff --git a/config/coreboot-msi_z690a_ddr5.config b/config/coreboot-msi_z690a_ddr5.config
index 573a57ae0..f1758d501 100644
--- a/config/coreboot-msi_z690a_ddr5.config
+++ b/config/coreboot-msi_z690a_ddr5.config
@@ -159,8 +159,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=29
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
diff --git a/config/coreboot-msi_z690a_ddr5.config_defconfig b/config/coreboot-msi_z690a_ddr5.config_defconfig
index 54972780e..f4bd4750f 100644
--- a/config/coreboot-msi_z690a_ddr5.config_defconfig
+++ b/config/coreboot-msi_z690a_ddr5.config_defconfig
@@ -5,8 +5,8 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7d25/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_MSI_Z690_A_PRO_WIFI_DDR5=y
diff --git a/config/coreboot-msi_z790p_ddr4.config b/config/coreboot-msi_z790p_ddr4.config
index f16fb5949..80cf4b735 100644
--- a/config/coreboot-msi_z790p_ddr4.config
+++ b/config/coreboot-msi_z790p_ddr4.config
@@ -159,8 +159,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=29
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
diff --git a/config/coreboot-msi_z790p_ddr4.config_defconfig b/config/coreboot-msi_z790p_ddr4.config_defconfig
index db4b4dd1f..2e2aec302 100644
--- a/config/coreboot-msi_z790p_ddr4.config_defconfig
+++ b/config/coreboot-msi_z790p_ddr4.config_defconfig
@@ -5,8 +5,8 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_MSI_Z790_P_PRO_WIFI_DDR4=y
diff --git a/config/coreboot-msi_z790p_ddr5.config b/config/coreboot-msi_z790p_ddr5.config
index 83c9fdb06..075251372 100644
--- a/config/coreboot-msi_z790p_ddr5.config
+++ b/config/coreboot-msi_z790p_ddr5.config
@@ -159,8 +159,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=29
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
diff --git a/config/coreboot-msi_z790p_ddr5.config_defconfig b/config/coreboot-msi_z790p_ddr5.config_defconfig
index 011f7a96a..3bfa73863 100644
--- a/config/coreboot-msi_z790p_ddr5.config_defconfig
+++ b/config/coreboot-msi_z790p_ddr5.config_defconfig
@@ -5,8 +5,8 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/msi/ms7e06/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_MSI_Z790_P_PRO_WIFI_DDR5=y