diff --git a/conf/machine/beaglev-starlight-jh7100.conf b/conf/machine/beaglev-starlight-jh7100.conf
index 1bd49c3..a2da8cd 100644
--- a/conf/machine/beaglev-starlight-jh7100.conf
+++ b/conf/machine/beaglev-starlight-jh7100.conf
@@ -15,8 +15,8 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-beaglev"
 PREFERRED_VERSION_openocd-native = "riscv"
 PREFERRED_VERSION_openocd = "riscv"
 
-EXTRA_IMAGEDEPENDS += "opensbi"
-RISCV_SBI_PLAT = "sifive/vic7100"
+EXTRA_IMAGEDEPENDS += "opensbi-beaglev"
+RISCV_SBI_PLAT = "starfive/vic7100"
 
 ## This sets u-boot as the default OpenSBI payload
 RISCV_SBI_PAYLOAD ?= "u-boot.bin"
@@ -44,7 +44,7 @@ UBOOT_DTB_LOADADDRESS = "0x82200000"
 
 ## wic default support
 WKS_FILE_DEPENDS ?= " \
-    opensbi \
+    opensbi-beaglev \
     e2fsprogs-native \
     bmap-tools-native \
 "
diff --git a/recipes-bsp/opensbi/opensbi-beaglev_0.8.0.bb b/recipes-bsp/opensbi/opensbi-beaglev_0.8.0.bb
index 863b236..cfdba50 100644
--- a/recipes-bsp/opensbi/opensbi-beaglev_0.8.0.bb
+++ b/recipes-bsp/opensbi/opensbi-beaglev_0.8.0.bb
@@ -10,7 +10,6 @@ inherit autotools-brokensep deploy
 
 SRCREV = "2524b0ecd8684b42bc7a4c69794f40f11cbbe2a5"
 SRC_URI = "git://github.com/starfive-tech/opensbi.git;branch=Fedora \
-           file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
           "
 
 S = "${WORKDIR}/git"
@@ -32,15 +31,16 @@ do_install_append() {
 
 do_deploy () {
 	install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/
-	install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/
-	install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/
+	# there are only fw_payload.* files generated for the vic7100 target
+	# install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/
+	# install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/
 }
 
 addtask deploy before do_build after do_install
 
-FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
+# FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
 FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
-FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
+# FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
 
 COMPATIBLE_HOST = "(riscv64|riscv32).*"
 INHIBIT_PACKAGE_STRIP = "1"