diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 045fa87..c5a197d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -28,9 +28,6 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53
 TARGET_EXCLUDES_AUDIOFX := true
 USE_XML_AUDIO_POLICY_CONF := 1
 
-# Display
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-
 # Enable 64-bits binder
 TARGET_USES_64_BIT_BINDER := true
 
diff --git a/product_prop.mk b/product_prop.mk
index a0034f6..521e871 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -1,3 +1,7 @@
+# Configstore
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.surface_flinger.max_frame_buffer_acquired_buffers=3
+
 # Graphics
 PRODUCT_PRODUCT_PROPERTIES += \
     debug.sf.latch_unsignaled=1