diff --git a/BoardConfig.mk b/BoardConfig.mk
index c71f098..6736b49 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -35,9 +35,6 @@ TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a75
 
-# APEX
-OVERRIDE_TARGET_FLATTEN_APEX := true
-
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := hiphi
 TARGET_NO_BOOTLOADER := true
diff --git a/twrp_hiphi.mk b/twrp_hiphi.mk
index 0c9561e..9891b26 100644
--- a/twrp_hiphi.mk
+++ b/twrp_hiphi.mk
@@ -9,6 +9,7 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
 # Inherit some common TWRP stuff.
 $(call inherit-product, vendor/twrp/config/common.mk)