diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fab3ec6..1c26312 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -26,6 +26,35 @@ TARGET_2ND_CPU_VARIANT := cortex-a75
 TARGET_BOOTLOADER_BOARD_NAME := taro
 TARGET_NO_BOOTLOADER := true
 
+# Metadata
+BOARD_USES_METADATA_PARTITION := true
+
+# Partitions
+BOARD_FLASH_BLOCK_SIZE := 0x020000 # (BOARD_KERNEL_PAGESIZE * 64)
+BOARD_BOOTIMAGE_PARTITION_SIZE := 0x0C000000
+BOARD_DTBOIMG_PARTITION_SIZE := 0x01800000
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x06400000
+BOARD_SUPER_PARTITION_SIZE := 9126805504 # 0x220000000
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 239033364480 # 0x37A77FB000
+BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000
+
+BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
+BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor vendor_dlkm
+BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 9122611200 # 0x21FC00000 # BOARD_SUPER_PARTITION_SIZE - overhead (4MiB)
+
+BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
+
+TARGET_COPY_OUT_ODM := odm
+TARGET_COPY_OUT_PRODUCT := product
+TARGET_COPY_OUT_SYSTEM_EXT := system_ext
+TARGET_COPY_OUT_VENDOR := vendor
+TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
+
 # Platform
 BOARD_USES_QCOM_HARDWARE := true
 TARGET_BOARD_PLATFORM := taro
diff --git a/common.mk b/common.mk
index 2185c23..c855c93 100644
--- a/common.mk
+++ b/common.mk
@@ -29,3 +29,6 @@ $(call inherit-product, vendor/xiaomi/sm8450-common/sm8450-common-vendor.mk)
 # API
 PRODUCT_SHIPPING_API_LEVEL := 31
 BOARD_SHIPPING_API_LEVEL := 31
+
+# Partitions
+PRODUCT_USE_DYNAMIC_PARTITIONS := true