diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e163330..7728867 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -119,7 +119,9 @@ BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744
 ifneq ($(WITH_GMS),true)
+BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1
 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1887436800
+BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 1887436800
 endif
 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4