diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2e9a5a9..8eac436 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -48,6 +48,7 @@ TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
 
 # Partitions
 TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2080374784
diff --git a/recovery.fstab b/recovery.fstab
index dde11b2..a6ef04f 100644
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -2,13 +2,13 @@
 /boot		emmc		/dev/block/bootdevice/by-name/boot
 /recovery       emmc            /dev/block/bootdevice/by-name/recovery
 /cache		ext4		/dev/block/bootdevice/by-name/cache
-/cust           ext4            /dev/block/bootdevice/by-name/cust		flags=display="Cust";backup=1
+/cust           ext4            /dev/block/bootdevice/by-name/cust		flags=display="Cust";backup=1;wipeingui
 /misc		emmc		/dev/block/bootdevice/by-name/misc		flags=display="Misc";backup=0
-/oeminfo        emmc            /dev/block/bootdevice/by-name/oeminfo		flags=display="OEMinfo";backup=1
+/oeminfo        emmc            /dev/block/bootdevice/by-name/oeminfo		flags=display="OEMinfo";backup=1;wipeingui
 /data		f2fs		/dev/block/dm-0
 /system		ext4		/dev/block/bootdevice/by-name/system
-/vendor		ext4		/dev/block/bootdevice/by-name/vendor		flags=display="Vendor";backup=1
-/product	ext4		/dev/block/bootdevice/by-name/product		flags=display="Product";backup=1
-/version	ext4		/dev/block/bootdevice/by-name/version		flags=display="Version";backup=1
+/vendor		ext4		/dev/block/bootdevice/by-name/vendor		flags=display="Vendor";backup=1;wipeingui
+/product	ext4		/dev/block/bootdevice/by-name/product		flags=display="Product";backup=1;wipeingui
+/version	ext4		/dev/block/bootdevice/by-name/version		flags=display="Version";backup=1;wipeingui
 /external_sd	vfat		/dev/block/mmcblk1p1	/dev/block/mmcblk1	flags=display="MicroSD Card";storage;wipeingui;removable
 /usbotg		auto		/dev/block/sda1         /dev/block/sda          flags=display="USB OTG";storage;removable;backup=0
diff --git a/recovery/root/init.rc b/recovery/root/init.rc
index 0e5cae1..136fca1 100644
--- a/recovery/root/init.rc
+++ b/recovery/root/init.rc
@@ -1,6 +1,7 @@
 import /init.recovery.logd.rc
 import /init.recovery.usb.rc
 import /init.recovery.service.rc
+import /init.recovery.vold_decrypt.rc
 import /init.recovery.${ro.hardware}.rc
 
 on early-init