diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9d9db13..3bc455a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -38,3 +38,6 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648
 BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
 BOARD_FLASH_BLOCK_SIZE := 262144
+
+# Properties
+TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
diff --git a/rootdir/etc/init.PL2.target.rc b/rootdir/etc/init.PL2.target.rc
index c564ab1..87cf2ca 100644
--- a/rootdir/etc/init.PL2.target.rc
+++ b/rootdir/etc/init.PL2.target.rc
@@ -1,17 +1,3 @@
-on early-boot
-    # Audio
-    setprop persist.audio.fluence.voicecomm true
-
-    # Camera
-    setprop persist.camera.ffcolor FFDAB9
-    setprop persist.capture.burst.exposures 0,-9,9
-
-    # Fingerprint
-    setprop ro.hardware.fingerprint elan
-
-    # Radio
-    setprop ro.rf.power.reduction.for.mcc 1
-
 on boot
     # Fingerprint
     chown system system /dev/elan_fp
diff --git a/vendor.prop b/vendor.prop
new file mode 100644
index 0000000..605c5ae
--- /dev/null
+++ b/vendor.prop
@@ -0,0 +1,12 @@
+# Audio
+persist.audio.fluence.voicecomm=true
+
+# Camera
+persist.camera.ffcolor=true
+persist.capture.burst.exposures=0,-9,9
+
+# Fingerprint
+ro.hardware.fingerprint=elan
+
+# Radio
+ro.rf.power.reduction.for.mcc=1