diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1384f15..4ef36ce 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -67,6 +67,9 @@ PRODUCT_EXTRA_VNDK_VERSIONS := 28
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
+# APEX
+DEXPREOPT_GENERATE_APEX_IMAGE := true
+
 # Audio
 USE_CUSTOM_AUDIO_POLICY := 1
 USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/common.mk b/common.mk
index 75a947b..eb7d77b 100644
--- a/common.mk
+++ b/common.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Enable updating of APEXes
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 # Get non-open-source specific aspects
 $(call inherit-product, vendor/oneplus/sdm845-common/sdm845-common-vendor.mk)