diff --git a/BoardConfig.mk b/BoardConfig.mk
index 219e0f0..7b1867b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,8 +12,6 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 #BOARD_ODMIMAGE_PARTITION_SIZE := 67108864
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-TARGET_NO_RECOVERY := true
-BOARD_USES_RECOVERY_AS_BOOT := true
 else
 # Define the Dynamic Partition sizes and groups.
 ifeq ($(ENABLE_VIRTUAL_AB), true)
@@ -108,6 +106,8 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_VENDOR := vendor
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
 else
 TARGET_RECOVERY_FSTAB := device/qcom/msmnile/recovery.fstab
 endif