diff --git a/device/rockchip/rk356x/nanopi5/device.mk b/device/rockchip/rk356x/nanopi5/device.mk
index f8e7d115dcd..c6d9e5adc03 100644
--- a/device/rockchip/rk356x/nanopi5/device.mk
+++ b/device/rockchip/rk356x/nanopi5/device.mk
@@ -74,7 +74,9 @@ endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.hwc.compose_policy=1 \
-    persist.demo.hdmirotates=true \
+    vendor.hwc.no_disconnected_dsi=true \
+    persist.sys.rotation.einit-1=0 \
+    ro.lockscreen.disable.default=true \
     ro.vendor.user_rotation=true \
     ro.boot.log_battery=false
 
diff --git a/device/rockchip/rk3576/nanopim5/device.mk b/device/rockchip/rk3576/nanopim5/device.mk
index 55641632400..14181d66d05 100644
--- a/device/rockchip/rk3576/nanopim5/device.mk
+++ b/device/rockchip/rk3576/nanopim5/device.mk
@@ -73,7 +73,9 @@ endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.hwc.compose_policy=1 \
-    persist.demo.hdmirotates=true \
+    vendor.hwc.no_disconnected_dsi=true \
+    persist.sys.rotation.einit-1=0 \
+    ro.lockscreen.disable.default=true \
     ro.vendor.user_rotation=true \
     ro.boot.log_battery=false
 
diff --git a/device/rockchip/rk3588/nanopi6/device.mk b/device/rockchip/rk3588/nanopi6/device.mk
index d7e20c3e51a..5b7dc193d9b 100644
--- a/device/rockchip/rk3588/nanopi6/device.mk
+++ b/device/rockchip/rk3588/nanopi6/device.mk
@@ -79,7 +79,9 @@ endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.hwc.compose_policy=1 \
-    persist.demo.hdmirotates=true \
+    vendor.hwc.no_disconnected_dsi=true \
+    persist.sys.rotation.einit-1=0 \
+    ro.lockscreen.disable.default=true \
     ro.vendor.user_rotation=true \
     ro.boot.log_battery=false