diff --git a/BoardConfig.mk b/BoardConfig.mk
index f900e286..dfdb3d39 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -50,6 +50,14 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 # Partitions (listed in the file) to be wiped under recovery.
 TARGET_RECOVERY_WIPE := device/google/wahoo/recovery.wipe
 
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
+BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := 4096
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
+BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 131072
+
 ENABLE_CPUSETS := true
 
 TARGET_COPY_OUT_VENDOR := vendor
diff --git a/device.mk b/device.mk
index 39f9db27..0686b672 100644
--- a/device.mk
+++ b/device.mk
@@ -75,15 +75,6 @@ else
       $(LOCAL_PATH)/init.hardware.diag.rc.user:root/init.$(PRODUCT_HARDWARE).diag.rc
 endif
 
-BOARD_KERNEL_PAGESIZE := 4096
-BOARD_FLASH_BLOCK_SIZE := 131072
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
-BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_VENDORIMAGE_PARTITION_SIZE := 419430400
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-
 MSM_VIDC_TARGET_LIST := msm8998 # Get the color format from kernel headers
 MASTER_SIDE_CP_TARGET_LIST := msm8998 # ION specific settings