diff --git a/config/evolution.mk b/config/evolution.mk
index 039cdec7..6a681376 100644
--- a/config/evolution.mk
+++ b/config/evolution.mk
@@ -48,6 +48,10 @@ PRODUCT_PACKAGES += \
     ColumbusService
 endif
 
+# Use a generic profile based boot image by default
+PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true
+PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := frameworks/base/boot/boot-image-profile.txt
+
 # Disable async MTE on a few processes
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
     persist.arm64.memtag.app.com.android.se=off \