diff --git a/BoardConfig.mk b/BoardConfig.mk
index 732d9b4..a6f07bc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -117,8 +117,15 @@ BOARD_MAIN_PARTITION_LIST := \
     product \
     vendor
 
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 2147483648
-BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 2147483648
+# Reserve space for gapps install
+ifneq ($(WITH_GMS),true)
+BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1
+BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 614400000
+BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 1752350720
+BOARD_SYSTEM_EXTIMAGE_EXTFS_INODE_COUNT := -1
+BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 92160000
+endif
 
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4