diff --git a/conf/machine/qemuriscv64.conf b/conf/machine/qemuriscv64.conf
index 25349ba..d99ac9e 100644
--- a/conf/machine/qemuriscv64.conf
+++ b/conf/machine/qemuriscv64.conf
@@ -21,6 +21,8 @@ SERIAL_CONSOLES = "38400;ttyS0 38400;hvc0"
 MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
 EXTRA_IMAGEDEPENDS += "riscv-pk"
 
+RISCV_BBL_PAYLOAD ?= "${KERNEL_IMAGETYPE}"
+
 # qemuboot options
 QB_MACHINE = "-machine virt"
 QB_DEFAULT_KERNEL = "bbl"
diff --git a/recipes-devtool/riscv-tools/riscv-pk.bb b/recipes-devtool/riscv-tools/riscv-pk.bb
index 17edbaf..76f979c 100644
--- a/recipes-devtool/riscv-tools/riscv-pk.bb
+++ b/recipes-devtool/riscv-tools/riscv-pk.bb
@@ -13,9 +13,7 @@ LDFLAGS_append = " -Wl,--build-id=none"
 
 inherit autotools
 
-EXTRA_OECONF += "--enable-logo --with-payload=${DEPLOY_DIR_IMAGE}/vmlinux"
-
-#DEPENDS = "riscv-fesvr-native riscv-spike-native"
+EXTRA_OECONF += "--enable-logo --with-payload=${DEPLOY_DIR_IMAGE}/${RISCV_BBL_PAYLOAD}"
 
 INHIBIT_PACKAGE_STRIP = "1"