diff --git a/device.mk b/device.mk
index 24c1953..037eb88 100644
--- a/device.mk
+++ b/device.mk
@@ -26,7 +26,8 @@ TARGET_SCREEN_HEIGHT := 1920
 TARGET_SCREEN_WIDTH := 1200
 
 # Device properties
-$(call inherit-product, $(DEVICE_PATH)/device_prop.mk)
+TARGET_SYSTEM_PROP += $(DEVICE_PATH)/properties/system.prop
+TARGET_VENDOR_PROP += $(DEVICE_PATH)/properties/vendor.prop
 
 # Folio
 PRODUCT_PACKAGES += \
diff --git a/device_prop.mk b/device_prop.mk
deleted file mode 100644
index df42ad9..0000000
--- a/device_prop.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2018 The Xiaomi-SDM660 Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# This file sets variables that control the way modules are built
-# thorughout the system. It should not be used to conditionally
-# disable makefiles (the proper mechanism to control what gets
-# included in a build is to use PRODUCT_PACKAGES in a product
-# definition file).
-#
-
-# Audio
-PRODUCT_VENDOR_PROPERTIES += \
-    persist.vendor.audio.fluence.audiorec=true
-
-# Camera
-PRODUCT_VENDOR_PROPERTIES += \
-    persist.camera.stats.test=5 \
-    persist.camera.HAL3.enabled=1 \
-    persist.camera.preview.ubwc=0
-
-# Display
-PRODUCT_VENDOR_PROPERTIES += \
-    debug.vds.allow_hwc=0
-
-# Single SIM
-PRODUCT_VENDOR_PROPERTIES += \
-    persist.radio.multisim.config=ssss
-
-# Ultra Sound
-SYSTEM_PROPERTY_OVERRIDES += \
-    audio.chk.cal.us=0
diff --git a/properties/system.prop b/properties/system.prop
new file mode 100644
index 0000000..50672c0
--- /dev/null
+++ b/properties/system.prop
@@ -0,0 +1 @@
+audio.chk.cal.us=0
diff --git a/properties/vendor.prop b/properties/vendor.prop
new file mode 100644
index 0000000..58bac97
--- /dev/null
+++ b/properties/vendor.prop
@@ -0,0 +1,9 @@
+persist.vendor.audio.fluence.audiorec=true
+
+persist.camera.stats.test=5
+persist.camera.HAL3.enabled=1
+persist.camera.preview.ubwc=0
+
+debug.vds.allow_hwc=0
+
+persist.radio.multisim.config=ssss