diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0d76c4b..03b20d1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,7 +19,11 @@ BOARD_BOOTIMAGE_PARTITION_SIZE     := 26738688
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 26767360
 BOARD_CACHEIMAGE_PARTITION_SIZE    := 268435456
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 10099646976
+ifeq ($(WITH_GMS_TV),true)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE   := 2147483648
+else
 BOARD_SYSTEMIMAGE_PARTITION_SIZE   := 1616904192
+endif
 BOARD_VENDORIMAGE_PARTITION_SIZE   := 379584512
 TARGET_USERIMAGES_USE_EXT4         := true
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE  := ext4
@@ -28,7 +32,10 @@ TARGET_COPY_OUT_VENDOR             := vendor
 BOARD_BUILD_SYSTEM_ROOT_IMAGE      := true
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := foster,darcy,jetson,loki,icosa,mdarcy,sif
+TARGET_OTA_ASSERT_DEVICE := foster,darcy,jetson,loki,icosa,mdarcy
+ifneq ($(WITH_GMS_TV),true)
+TARGET_OTA_ASSERT_DEVICE := $(TARGET_OTA_ASSERT_DEVICE),sif
+endif
 
 # Boot image
 BOARD_CUSTOM_BOOTIMG    := true