diff --git a/BoardConfig.mk b/BoardConfig.mk
index 106608b..ff551c7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,8 +22,12 @@ BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200,n8 earlycon=msm_serial_dm,0xc1b00
 include device/google/wahoo/BoardConfig.mk
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 41943040
+BOARD_SYSTEM_EXTIMAGE_PARTITION_SIZE := 524288000
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_AVB_ENABLE := true
 
+TARGET_COPY_OUT_SYSTEM_EXT := system_ext
+
 # sepolicy
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/taimen/sepolicy
 
@@ -107,4 +111,6 @@ AB_OTA_PARTITIONS += \
     system \
     vbmeta \
     dtbo \
-    vendor
+    vendor \
+    product \
+    system_ext
diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
index d29fedc..af552e7 100644
--- a/gpt-utils/gpt-utils.h
+++ b/gpt-utils/gpt-utils.h
@@ -84,7 +84,7 @@ extern "C" {
         "cmnlib64", "devcfg", "dtbo", "hosd", "hyp", "laf", "keymaster", \
         "lockbooter", "msadp", "pmic", "rpm", "storsec", \
         "trusty", "tz", "vbmeta"
-#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem"
+#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", "product", "system_ext"
 #define BOOT_DEV_DIR    "/dev/block/bootdevice/by-name"
 
 /******************************************************************************
diff --git a/recovery.wipe b/recovery.wipe
index 03e5e18..586c5f8 100644
--- a/recovery.wipe
+++ b/recovery.wipe
@@ -4,6 +4,10 @@
 /dev/block/bootdevice/by-name/vendor_a
 /dev/block/bootdevice/by-name/vendor_b
 /dev/block/bootdevice/by-name/userdata
+/dev/block/bootdevice/by-name/product_a
+/dev/block/bootdevice/by-name/product_b
+/dev/block/bootdevice/by-name/system_ext_a
+/dev/block/bootdevice/by-name/system_ext_b
 # Wipe the boot partitions last so that all partitions will be wiped
 # correctly even if the wiping process gets interrupted by a force boot.
 /dev/block/bootdevice/by-name/boot_a