diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3bdbe48..d340583 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -52,6 +52,8 @@ BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02200000 --tags_offset 0x02000000
+BOARD_CUSTOM_BOOTIMG := true
+BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_SOURCE := kernel/samsung/msm8996
 TARGET_KERNEL_CONFIG := lineageos_gts3llte_defconfig
@@ -156,14 +158,13 @@ DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 79691776
-BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200
+BOARD_CACHEIMAGE_PARTITION_SIZE := 186351616
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := f2fs
-BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
+BOARD_PERSISTIMAGE_PARTITION_SIZE := 28811264
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 79691776
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3072000000
-#BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4194304000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 26226982912
-BOARD_FLASH_BLOCK_SIZE := 131072
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4061331456
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 25680748544
+BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64)
 BOARD_ROOT_EXTRA_SYMLINKS := \
     /mnt/vendor/persist:/persist \
     /mnt/vendor/efs:/efs \