diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
index a4d51904..58cd92c4 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
@@ -8,4 +8,4 @@ SYSFW_SOC = "j721s2"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 
-UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig"
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 7ce5000a..7d2d6271 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -15,7 +15,7 @@ KERNEL_DEVICETREE = " \
     ti/k3-j721s2-gesi-exp-board.dtbo \
 "
 
-UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
+UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
 
 do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"