diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index dae93fb..c6bc1ce 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -21,6 +21,9 @@ AB_OTA_PARTITIONS += \
     vendor \
     vendor_boot
 
+# APEX
+DEXPREOPT_GENERATE_APEX_IMAGE := true
+
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
diff --git a/holi.mk b/holi.mk
index 405759c..347e8c0 100644
--- a/holi.mk
+++ b/holi.mk
@@ -27,6 +27,9 @@ PRODUCT_PACKAGES += \
 # Enable virtual A/B OTA
 $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
 
+# APEX's
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 # AVB
 PRODUCT_PACKAGES += \
     q-gsi.avbpubkey \