diff --git a/lineage_salami.mk b/lineage_salami.mk
index 7530073..84edfcc 100644
--- a/lineage_salami.mk
+++ b/lineage_salami.mk
@@ -20,14 +20,12 @@ PRODUCT_MANUFACTURER := OnePlus
 PRODUCT_BRAND := OnePlus
 PRODUCT_MODEL := CPH2449
 
-PRODUCT_SYSTEM_NAME := $(PRODUCT_MODEL)
-PRODUCT_SYSTEM_DEVICE := OP594DL1
-
 PRODUCT_GMS_CLIENTID_BASE := android-oneplus
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="CPH2449EEA-user 14 TP1A.220905.001 T.R4T3.1a1ad1b_1-6 release-keys" \
-    TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
-    TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
-
-BUILD_FINGERPRINT := OnePlus/CPH2449EEA/OP594DL1:14/TP1A.220905.001/T.R4T3.1a1ad1b_1-6:user/release-keys
+    BuildDesc="CPH2449EEA-user 14 TP1A.220905.001 T.R4T3.1a1ad1b_1-6 release-keys" \
+    BuildFingerprint=OnePlus/CPH2449EEA/OP594DL1:14/TP1A.220905.001/T.R4T3.1a1ad1b_1-6:user/release-keys \
+    DeviceName=OP594DL1 \
+    DeviceProduct=CPH2449 \
+    SystemDevice=OP594DL1 \
+    SystemName=CPH2449