diff --git a/common_prop.mk b/common_prop.mk
index 3407d927..2ac05e9d 100644
--- a/common_prop.mk
+++ b/common_prop.mk
@@ -1,6 +1,12 @@
 #Build FP to be picked by both system and vendor
 BUILD_FINGERPRINT := "xiaomi/wayne/wayne:8.1.0/OPM1.171019.011/V9.5.11.0.ODCCNFA:user/release-keys"
 
+# Apex
+ifeq ($(ENABLE_APEX), true)
+PRODUCT_PRODUCT_PROPERTIES += \
+     ro.apex.updatable=true
+endif
+
 # ART
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.boot-dex2oat-threads=8 \
diff --git a/sdm660.mk b/sdm660.mk
index 5da79978..e286c47f 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -32,7 +32,9 @@ $(call inherit-product-if-exists, build/target/product/embedded.mk)
 
 # Enable updating of APEXes
 ifeq ($(ENABLE_APEX), true)
+TARGET_SUPPORTS_UPDATABLE_APEX := true
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+$(call inherit-product-if-exists, vendor/prebuilts/config/apex.mk)
 endif
 
 # Inherit proprietary files