diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a24587c..e163330 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -118,8 +118,10 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744
+ifneq ($(WITH_GMS),true)
 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1887436800
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 1887436800
+endif
 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_ONEPLUS_DYNAMIC_PARTITIONS_PARTITION_LIST := product system