diff --git a/BoardConfig.mk b/BoardConfig.mk
index 66a90b2..2b9549c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,6 +31,11 @@ SOONG_CONFIG_ONEPLUS_KONA_FOD_SIZE = 232
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
 # Partitions
+ifneq ($(WITH_GMS),true)
+BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1156055040
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 660602880
+BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 660602880
+endif
 BOARD_ONEPLUS_DYNAMIC_PARTITIONS_SIZE := 7511998464
 BOARD_SUPER_PARTITION_SIZE := 15032385536