diff --git a/BoardConfig.mk b/BoardConfig.mk
index 18426be6..3b6dc3f5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -150,13 +150,8 @@ SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
 # Display
 TARGET_HAS_WIDE_COLOR_DISPLAY := true
 TARGET_HAS_HDR_DISPLAY := false
-TARGET_USE_COLOR_MANAGEMENT := true
 TARGET_USES_COLOR_METADATA := true
 
-# Must align with HAL types Dataspace
-# The data space of wide color gamut composition preference is Dataspace::DISPLAY_P3
-SF_WCG_COMPOSITION_DATA_SPACE := 143261696
-
 # Charger Mode
 BOARD_CHARGER_ENABLE_SUSPEND := true
 
diff --git a/device.mk b/device.mk
index d235b765..67d2dc41 100755
--- a/device.mk
+++ b/device.mk
@@ -698,3 +698,9 @@ endif
 # default atrace HAL
 PRODUCT_PACKAGES += \
     android.hardware.atrace@1.0-service
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=true
+
+# Must align with HAL types Dataspace
+# The data space of wide color gamut composition preference is Dataspace::DISPLAY_P3
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.wcg_composition_dataspace=143261696