diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8fe3770..49ea735 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -79,5 +79,4 @@ BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 TARGET_COPY_OUT_VENDOR := vendor
 
 # VNDK
-BOARD_VNDK_RUNTIME_DISABLE := true
 BOARD_VNDK_VERSION := current
diff --git a/product_prop.mk b/product_prop.mk
index 9acd6b3..e589668 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -15,3 +15,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.lmk.log_stats=true \
     ro.lmk.use_minfree_levels=true \
     ro.lmk.use_psi=false
+
+# VNDK
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.vndk.lite=false