diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5b7300d..89c86d8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -64,9 +64,6 @@ BOARD_HAS_QCA_FM_SOC := "cherokee"
 
 # Graphics
 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x200000U | 0x2000U
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
-SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
 
 # HIDL
 DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
diff --git a/product_prop.mk b/product_prop.mk
index 3259d2d..fed0c9c 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -22,8 +22,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.dbg.vt_avail_ovr=1 \
     persist.dbg.wfc_avail_ovr=1
 
+# Surfaceflinger
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.surface_flinger.max_frame_buffer_acquired_buffers=3 \
+    ro.surface_flinger.vsync_event_phase_offset_ns=2000000 \
+    ro.surface_flinger.vsync_sf_event_phase_offset_ns=6000000
+
 # WiFi Display
 PRODUCT_PRODUCT_PROPERTIES += \
     debug.sf.enable_hwc_vds=1 \
     persist.vendor.radio.atfwd.start=false
-