diff --git a/system.prop b/system.prop
index 645e211..6302993 100644
--- a/system.prop
+++ b/system.prop
@@ -36,8 +36,8 @@ media.stagefright.thumbnail.prefer_hw_codecs=true
 mm.enable.smoothstreaming=true
 persist.mm.enable.prefetch=true
 ro.media.recorder-max-base-layer-fps=60
-ro.media.xml_variant.codecs=lahaina
-ro.media.xml_variant.codecs_performance=lahaina
+ro.media.xml_variant.codecs=_lahaina
+ro.media.xml_variant.codecs_performance=_lahaina
 vendor.mm.enable.qcom_parser=16777215
 
 # Netflix
diff --git a/system_ext.prop b/system_ext.prop
index 586da65..6ef912a 100644
--- a/system_ext.prop
+++ b/system_ext.prop
@@ -1,2 +1,5 @@
 # DPM
 persist.vendor.dpm.feature=11
+
+# Media
+vendor.media.target_variant=_lahaina
diff --git a/vendor.prop b/vendor.prop
index cacffe3..f145e0e 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -227,6 +227,8 @@ persist.mm.enable.prefetch=true
 ro.config.media_vol_default=15
 ro.config.media_vol_steps=25
 ro.config.vc_call_vol_steps=11
+ro.media.xml_variant.codecs=_lahaina
+ro.media.xml_variant.codecs_performance=_lahaina
 ro.vendor.media.video.frc.support=true
 ro.vendor.media.video.vpp.support=true
 vendor.media.vpp.aie.cade=100
@@ -239,6 +241,7 @@ vendor.media.vpp.aie.ltmsatoff=55
 vendor.media.vpp.debug.value.use=false
 vendor.mm.enable.qcom_parser=16777215
 vendor.mm.enable.qcom_parser=63963135
+vendor.media.target_variant=_lahaina
 
 # NFC
 ro.nfc.port=I2C
@@ -298,6 +301,9 @@ persist.vendor.sensors.allow_non_default_discovery=true
 persist.vendor.sensors.on_change_sample_period=true
 persist.vendor.sensors.sync_request=true
 
+# SKU
+ro.boot.product.vendor.sku=lahaina
+
 # SSR
 persist.vendor.ssr.restart_level=ALL_ENABLE