diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 67fbbdd..687669f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -156,7 +156,6 @@ VENDOR_SECURITY_PATCH := 2021-09-01
 TARGET_SEPOLICY_DIR := msmsteppe
 include device/qcom/sepolicy_vndr/SEPolicy.mk
 
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 
 # Verified Boot
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
deleted file mode 100644
index 3448642..0000000
--- a/sepolicy/private/property_contexts
+++ /dev/null
@@ -1,8 +0,0 @@
-ro.boot.hwc                    u:object_r:exported_default_prop:s0
-ro.boot.hwversion              u:object_r:exported_default_prop:s0
-ro.build.flavor                u:object_r:exported_default_prop:s0
-ro.camera.req.fmq.size         u:object_r:exported_default_prop:s0
-ro.camera.res.fmq.size         u:object_r:exported_default_prop:s0
-ro.cust.test                   u:object_r:exported_default_prop:s0
-ro.miui.                       u:object_r:exported_system_prop:s0
-ro.product.mod_device          u:object_r:exported2_default_prop:s0
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index d71e77b..43f4026 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -9,6 +9,8 @@ camera.sensor.frontMain.fuseID     u:object_r:vendor_camera_prop:s0
 camera.sensor.rearUltra.fuseID     u:object_r:vendor_camera_prop:s0
 camera.sensor.rearTele.fuseID      u:object_r:vendor_camera_prop:s0
 persist.camera.                    u:object_r:vendor_camera_prop:s0
+ro.camera.req.fmq.size             u:object_r:vendor_camera_prop:s0
+ro.camera.res.fmq.size             u:object_r:vendor_camera_prop:s0
 
 # Fingerprint
 gf.debug.                          u:object_r:vendor_fp_prop:s0
@@ -24,5 +26,13 @@ vendor.powerhal.                   u:object_r:vendor_power_prop:s0
 # Sensors
 persist.sensor.                    u:object_r:persist_sensors_prop:s0
 
+# Xiaomi specific build properties
+ro.boot.hwc                        u:object_r:build_prop:s0
+ro.boot.hwversion                  u:object_r:build_prop:s0
+ro.build.flavor                    u:object_r:build_prop:s0
+ro.cust.test                       u:object_r:build_prop:s0
+ro.miui.                           u:object_r:build_prop:s0
+ro.product.mod_device              u:object_r:build_prop:s0
+
 # Xiaomi thermal daemon
 vendor.sys.thermal.                u:object_r:vendor_thermal_normal_prop:s0