diff --git a/conf/machine/qemuriscv64.conf b/conf/machine/qemuriscv64.conf
index 0504ace..af3d62a 100644
--- a/conf/machine/qemuriscv64.conf
+++ b/conf/machine/qemuriscv64.conf
@@ -8,7 +8,10 @@ KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_IMAGE_STRIP_EXTRA_SECTIONS  = ".comment"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-riscv"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-riscv-libc-headers"
+PREFERRED_VERSION_qemu = "riscv"
+PREFERRED_VERSION_qemu-native = "riscv"
+PREFERRED_VERSION_nativesdk-qemu = "riscv"
+GDBVERSION = "riscv"
 
 SERIAL_CONSOLE = "38400 ttyHTIF0"
 USE_VT ?= "0"