diff --git a/meta-rauc-qemux86/conf/layer.conf b/meta-rauc-qemux86/conf/layer.conf
index de26c0c..69aa53b 100644
--- a/meta-rauc-qemux86/conf/layer.conf
+++ b/meta-rauc-qemux86/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-rauc-qemux86 = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-rauc-qemux86 = "6"
 
 LAYERDEPENDS_meta-rauc-qemux86 = "core"
-LAYERSERIES_COMPAT_meta-rauc-qemux86 = "kirkstone nanbield"
+LAYERSERIES_COMPAT_meta-rauc-qemux86 = "styhead"
diff --git a/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb b/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb
index 5a30063..342e6df 100644
--- a/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb
+++ b/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb
@@ -11,20 +11,21 @@ SRC_URI += " \
     file://grubenv \
     "
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit deploy
 
 do_install() {
         install -d ${D}${EFI_FILES_PATH}
-        install -m 644 ${WORKDIR}/grub.cfg ${D}${EFI_FILES_PATH}/grub.cfg
+        install -m 644 ${S}/grub.cfg ${D}${EFI_FILES_PATH}/grub.cfg
 }
 
 FILES:${PN} += "${EFI_FILES_PATH}"
 
 do_deploy() {
-	install -m 644 ${WORKDIR}/grub.cfg ${DEPLOYDIR}
-	install -m 644 ${WORKDIR}/grubenv ${DEPLOYDIR}
+	install -m 644 ${S}/grub.cfg ${DEPLOYDIR}
+	install -m 644 ${S}/grubenv ${DEPLOYDIR}
 }
 
 addtask deploy after do_install before do_build
diff --git a/meta-rauc-qemux86/recipes-core/rauc/rauc_%.bbappend b/meta-rauc-qemux86/recipes-core/rauc/rauc-conf.bbappend
similarity index 100%
rename from meta-rauc-qemux86/recipes-core/rauc/rauc_%.bbappend
rename to meta-rauc-qemux86/recipes-core/rauc/rauc-conf.bbappend
diff --git a/meta-rauc-qemux86/recipes-core/rauc/rauc_rauc.inc b/meta-rauc-qemux86/recipes-core/rauc/rauc-conf_rauc.inc
similarity index 100%
rename from meta-rauc-qemux86/recipes-core/rauc/rauc_rauc.inc
rename to meta-rauc-qemux86/recipes-core/rauc/rauc-conf_rauc.inc
diff --git a/meta-rauc-qemux86/wic/qemux86-grub-efi.wks b/meta-rauc-qemux86/wic/qemux86-grub-efi.wks
index 4aa1bb5..e0f7ce4 100644
--- a/meta-rauc-qemux86/wic/qemux86-grub-efi.wks
+++ b/meta-rauc-qemux86/wic/qemux86-grub-efi.wks
@@ -12,6 +12,6 @@ part --fixed-size 50M --source rawcopy --sourceparams="file=efi-boot.vfat" --fst
 part --fixed-size 50M --ondisk sda --align 4096 --no-table
 part --fixed-size 10M --source rawcopy --sourceparams="file=grubenv.vfat" --fstype=vfat --ondisk sda --label grubenv --align 1024
 part /rescue --source rootfs --ondisk sda --fstype=ext4 --label rescue --align 1024
-part / --source rootfs --ondisk sda --fstype=ext4 --label root_a --fixed-size=150M --align 4096
-part / --source rootfs --ondisk sda --fstype=ext4 --label root_b --fixed-size=150M --align 4096
+part / --source rootfs --ondisk sda --fstype=ext4 --label root_a --fixed-size=200M --align 4096
+part / --source empty --ondisk sda --fstype=ext4 --label root_b --fixed-size=200M --align 4096
 part /data --fixed-size 100M --ondisk sda --fstype=ext4 --label data --align 4096