diff --git a/BoardConfig.mk b/BoardConfig.mk
index 08f0797..2943816 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,9 +42,6 @@ BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
 TARGET_HAS_HDR_DISPLAY := true
 TARGET_HAS_WIDE_COLOR_DISPLAY := true
 
-# Camera
-TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
-
 # Display
 TARGET_SCREEN_DENSITY := 440
 TARGET_USES_COLOR_METADATA := true
diff --git a/device.mk b/device.mk
index 3f0e411..5263f4c 100644
--- a/device.mk
+++ b/device.mk
@@ -183,6 +183,7 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.camera.postproc@1.0.vendor \
     vendor.xiaomi.hardware.motor@1.0.vendor
 
+$(call soong_config_set,camera,override_format_from_reserved,true)
 $(call soong_config_set,camera,package_name,com.android.camera)
 $(call soong_config_set,libcameraservice,ext_lib,libcameraservice_extension.raphael)