diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf
index 4c27ff2f..ceac81b8 100644
--- a/meta-isar/conf/machine/qemumipsel.conf
+++ b/meta-isar/conf/machine/qemumipsel.conf
@@ -8,6 +8,9 @@ KERNEL_NAME ?= "4kc-malta"
 IMAGE_FSTYPES ?= "ext4"
 ROOTFS_EXTRA ?= "128"
 
+# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default
+WKS_FILE ?= "qemudefault"
+
 QEMU_ROOTFS_DEV ?= "sda"
 
 QEMU_ARCH ?= "mipsel"
diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf
index 15711054..b9656090 100644
--- a/meta-isar/conf/machine/qemuriscv64.conf
+++ b/meta-isar/conf/machine/qemuriscv64.conf
@@ -11,6 +11,9 @@ KERNEL_NAME ?= "riscv64"
 IMAGE_FSTYPES ?= "ext4"
 ROOTFS_EXTRA ?= "128"
 
+# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default
+WKS_FILE ?= "qemuriscv"
+
 QEMU_ROOTFS_DEV ?= "vda"
 
 QEMU_ARCH ?= "riscv64"
diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index 980856ac..38b5f0e1 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -8,9 +8,6 @@ USING_WIC = "${@bb.utils.contains('IMAGE_BASETYPES', 'wic', '1', '0', d)}"
 WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if bb.utils.to_boolean(d.getVar('USING_WIC')) else ''}"
 
 WKS_FILE ??= "sdimage-efi"
-# grub-efi is incompatible with targets riscv64 and mipsel
-WKS_FILE:riscv64 ??= "qemuriscv"
-WKS_FILE:mipsel ??= "qemudefault"
 
 do_copy_wks_template[file-checksums] += "${WKS_FILE_CHECKSUM}"
 do_copy_wks_template[vardepsexclude] += "WKS_TEMPLATE_PATH"