diff --git a/recipes-core/initrdscripts/initramfs-framework/rorootfs-overlay b/recipes-core/initrdscripts/initramfs-framework/rorootfs-overlay
index 9c91ade..10e13f7 100644
--- a/recipes-core/initrdscripts/initramfs-framework/rorootfs-overlay
+++ b/recipes-core/initrdscripts/initramfs-framework/rorootfs-overlay
@@ -107,12 +107,12 @@ rorootfs_run() {
 	[ -n "$bootparam_init" ] && INIT="$bootparam_init"
 	[ -n "$bootparam_rootinit" ] && ROOT_ROINIT="$bootparam_rootinit"
 	[ -n "$bootparam_rootrwreset" ] && ROOT_RWRESET="$bootparam_rootrwreset"
-	[ -n "$bootparam_rootrwreset" ] && ROOT_RWRESET2="$bootparam_rootrwreset2"
-	[ -n "$bootparam_rootrwreset" ] && FACTORY_RESET="$bootparam_factoryreset"
+	[ -n "$bootparam_rootrwreset2" ] && ROOT_RWRESET2="$bootparam_rootrwreset2"
+	[ -n "$bootparam_factoryreset" ] && FACTORY_RESET="$bootparam_factoryreset"
 
 	[ -n "$bootparam_root" ] && ROOT_RODEVICE="$(rorootfs_find_device "$bootparam_root")"
 	[ -n "$bootparam_rootrw" ] && ROOT_RWDEVICE="$(rorootfs_find_device "$bootparam_rootrw")"
-	[ -n "$bootparam_rootrw" ] && ROOT_RWDEVICE2="$(rorootfs_find_device "$bootparam_rootrw2")"
+	[ -n "$bootparam_rootrw2" ] && ROOT_RWDEVICE2="$(rorootfs_find_device "$bootparam_rootrw2")"
 
 	[ -n "$bootparam_rootfstype" ] && ROOT_ROFSTYPE="$bootparam_rootfstype"
 	[ -n "$bootparam_rootoptions" ] && ROOT_ROMOUNTOPTIONS="$bootparam_rootoptions"
@@ -120,8 +120,8 @@ rorootfs_run() {
 	[ -n "$bootparam_rootrwfstype" ] && ROOT_RWFSTYPE="$bootparam_rootrwfstype"
 	[ -n "$bootparam_rootrwoptions" ] && ROOT_RWMOUNTOPTIONS="$bootparam_rootrwoptions"
 
-	[ -n "$bootparam_rootrwfstype" ] && ROOT_RWFSTYPE2="$bootparam_rootrwfstype2"
-	[ -n "$bootparam_rootrwoptions" ] && ROOT_RWMOUNTOPTIONS2="$bootparam_rootrwoptions2"
+	[ -n "$bootparam_rootrwfstype2" ] && ROOT_RWFSTYPE2="$bootparam_rootrwfstype2"
+	[ -n "$bootparam_rootrwoptions2" ] && ROOT_RWMOUNTOPTIONS2="$bootparam_rootrwoptions2"
 
 	# We use 2nd level of overlay if rootrw2 was given in the kernel cmdline
 	# AND rwoverlaylvl was set to 2
diff --git a/recipes-kernel/linux/files/overlayfs.cfg b/recipes-kernel/linux/files/overlayfs.cfg
new file mode 100644
index 0000000..084ac6f
--- /dev/null
+++ b/recipes-kernel/linux/files/overlayfs.cfg
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+CONFIG_OVERLAY_FS=y
diff --git a/recipes-kernel/linux/linux-readonly-rootfs-overlay.inc b/recipes-kernel/linux/linux-readonly-rootfs-overlay.inc
index cc2bfe6..73bf5c3 100644
--- a/recipes-kernel/linux/linux-readonly-rootfs-overlay.inc
+++ b/recipes-kernel/linux/linux-readonly-rootfs-overlay.inc
@@ -1 +1,5 @@
-KERNEL_FEATURES_append = " features/overlayfs/overlayfs.scc"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_append = " \
+	file://overlayfs.cfg \
+"
+