diff --git a/BoardConfig.mk b/BoardConfig.mk
index d65051c..820e110 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -57,6 +57,9 @@
 # Api
 #PRODUCT_SHIPPING_API_LEVEL := 28
 
+# APEX
+DEXPREOPT_GENERATE_APEX_IMAGE := true
+
 # Audio
 #USE_CUSTOM_AUDIO_POLICY := 1
 USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/device.mk b/device.mk
index c93a558..0aaa15c 100755
--- a/device.mk
+++ b/device.mk
@@ -22,6 +22,9 @@
 $(call inherit-product, vendor/asus/zenfone6/zenfone6-vendor.mk)
 $(call inherit-product-if-exists, vendor/gapps/arm64/arm64-vendor.mk)
 
+# Enable updating of APEXes
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 #from build treble includes
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc \