diff --git a/src/mainboard/google/rex/variants/baseboard/ovis/devicetree_pre_prod.cb b/src/mainboard/google/rex/variants/baseboard/ovis/devicetree_pre_prod.cb
index 0835ded..7358eeb 100644
--- a/src/mainboard/google/rex/variants/baseboard/ovis/devicetree_pre_prod.cb
+++ b/src/mainboard/google/rex/variants/baseboard/ovis/devicetree_pre_prod.cb
@@ -52,6 +52,8 @@
 	register "cnvi_bt_core" = "true"
 
 	register "sagv" = "SAGV_ENABLED"
+	# TODO(b/287170545): workaround avoid DUT random hang
+	register "sagv_wp_bitmap" = "SAGV_POINTS_0_1_2"
 
 	register "sagv_freq_mhz[0]" = "3200"
 	register "sagv_gear[0]" = "4"
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/devicetree_pre_prod.cb b/src/mainboard/google/rex/variants/baseboard/rex/devicetree_pre_prod.cb
index 5894fe6..625a36b 100644
--- a/src/mainboard/google/rex/variants/baseboard/rex/devicetree_pre_prod.cb
+++ b/src/mainboard/google/rex/variants/baseboard/rex/devicetree_pre_prod.cb
@@ -49,6 +49,8 @@
 	register "cnvi_bt_core" = "true"
 
 	register "sagv" = "SAGV_ENABLED"
+	# TODO(b/287170545): workaround avoid DUT random hang
+	register "sagv_wp_bitmap" = "SAGV_POINTS_0_1_2"
 
 	register "sagv_freq_mhz[0]" = "3200"
 	register "sagv_gear[0]" = "4"