diff --git a/caiman/uwb/calibration.conf b/caiman/uwb/calibration.conf
index b16e3f95..aedbc7ac 100644
--- a/caiman/uwb/calibration.conf
+++ b/caiman/uwb/calibration.conf
@@ -1,12 +1,12 @@
 # common calibration file
-ant0.ch5.ant_delay=00:40:00:00
-ant0.ch9.ant_delay=F1:3F:00:00
+ant0.ch5.ant_delay=31:40:00:00
+ant0.ch9.ant_delay=15:40:00:00
 
 ant1.ch5.ant_delay=10:40:00:00
 ant1.ch9.ant_delay=10:40:00:00
 
-ant2.ch5.ant_delay=2E:40:00:00
-ant2.ch9.ant_delay=24:40:00:00
+ant2.ch5.ant_delay=3F:40:00:00
+ant2.ch9.ant_delay=3B:40:00:00
 
 ant3.ch5.ant_delay=10:40:00:00
 ant3.ch9.ant_delay=10:40:00:00
@@ -19,17 +19,17 @@ xtal_trim=0x30
 dual_rx_auto.accum_period=0x00
 
 # Increase TX power of 0.25 dB
-# ant0.ch5.pa_gain_offset=0x00
-# ant0.ch9.pa_gain_offset=0x00
+ant0.ch5.pa_gain_offset=0x00
+ant0.ch9.pa_gain_offset=0x00
 
 # Decrease TX power of -0.25 dB
-# ant1.ch5.pa_gain_offset=0x00
-# ant1.ch9.pa_gain_offset=0x00
+ant1.ch5.pa_gain_offset=0x00
+ant1.ch9.pa_gain_offset=0x00
 
 # Increase TX power of 0.25 dB
-# ant2.ch5.pa_gain_offset=0x00
-# ant2.ch9.pa_gain_offset=0x00
+ant2.ch5.pa_gain_offset=0x00
+ant2.ch9.pa_gain_offset=0x00
 
 # Decrease TX power of -0.25 dB
-# ant3.ch5.pa_gain_offset=0x00
-# ant3.ch9.pa_gain_offset=0x00
+ant3.ch5.pa_gain_offset=0x00
+ant3.ch9.pa_gain_offset=0x00
diff --git a/device-caiman.mk b/device-caiman.mk
index d005652f..9dbd8ff5 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -324,7 +324,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.preferred_mode=96
 
 ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1
-    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=5:120,:1
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=:1
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif
diff --git a/device-komodo.mk b/device-komodo.mk
index 12a328f6..d12d9f72 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -79,7 +79,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.preferred_mode=10
 
 ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),)
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1
-    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=5:120,:1
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=:1
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif
diff --git a/komodo/uwb/calibration.conf b/komodo/uwb/calibration.conf
index d70e4b57..a4a752f8 100644
--- a/komodo/uwb/calibration.conf
+++ b/komodo/uwb/calibration.conf
@@ -1,12 +1,12 @@
 # common calibration file
-ant0.ch5.ant_delay=2B:40:00:00
-ant0.ch9.ant_delay=15:40:00:00
+ant0.ch5.ant_delay=57:40:00:00
+ant0.ch9.ant_delay=4B:40:00:00
 
 ant1.ch5.ant_delay=10:40:00:00
 ant1.ch9.ant_delay=10:40:00:00
 
-ant2.ch5.ant_delay=2B:40:00:00
-ant2.ch9.ant_delay=15:40:00:00
+ant2.ch5.ant_delay=3D:40:00:00
+ant2.ch9.ant_delay=4D:40:00:00
 
 ant3.ch5.ant_delay=10:40:00:00
 ant3.ch9.ant_delay=10:40:00:00