diff --git a/config/BoardConfigReservedSize.mk b/config/BoardConfigReservedSize.mk
index 3ebe3971..00303034 100644
--- a/config/BoardConfigReservedSize.mk
+++ b/config/BoardConfigReservedSize.mk
@@ -9,11 +9,21 @@ ifneq ($(WITH_GMS),true)
 BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT ?= -1
 ifeq ($(BOARD_PRODUCTIMAGE_MINIMAL_PARTITION_RESERVED_SIZE),true)
 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE ?= 1188036608
-else
+else # BOARD_PRODUCTIMAGE_MINIMAL_PARTITION_RESERVED_SIZE
 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE ?= 1957691392
 endif
 BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT ?= -1
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE ?= 94371840
 BOARD_SYSTEM_EXTIMAGE_EXTFS_INODE_COUNT ?= -1
 BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE ?= 94371840
+else # WITH_GMS
+ifneq ($(TARGET_BUILD_VARIANT),user)
+BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE ?= 8388609
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE ?= 8388609
+BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE ?= 8388609
+endif
+endif
+
+ifneq ($(TARGET_BUILD_VARIANT),user)
+BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE ?= 8388609
 endif