diff --git a/device.mk b/device.mk
index ed277d5f..5f1378c0 100644
--- a/device.mk
+++ b/device.mk
@@ -477,9 +477,9 @@ PRODUCT_COPY_FILES += \
 # Vibrator HAL
 PRODUCT_PRODUCT_PROPERTIES +=\
     ro.vibrator.hal.config.dynamic=1 \
-    ro.vibrator.hal.click.duration=8 \
-    ro.vibrator.hal.tick.duration=8 \
-    ro.vibrator.hal.heavyclick.duration=8 \
+    ro.vibrator.hal.click.duration=6 \
+    ro.vibrator.hal.tick.duration=6 \
+    ro.vibrator.hal.heavyclick.duration=6 \
     ro.vibrator.hal.long.voltage=161 \
     ro.vibrator.hal.long.frequency.shift=0 \
     ro.vibrator.hal.steady.shape=1
diff --git a/vibrator/drv2624/Hardware.h b/vibrator/drv2624/Hardware.h
index 707ea88a..d43fa6d6 100644
--- a/vibrator/drv2624/Hardware.h
+++ b/vibrator/drv2624/Hardware.h
@@ -98,7 +98,7 @@ class HwCal : public Vibrator::HwCal, private HwCalBase {
 
     static constexpr uint32_t WAVEFORM_CLICK_EFFECT_MS = 6;
     static constexpr uint32_t WAVEFORM_TICK_EFFECT_MS = 2;
-    static constexpr uint32_t WAVEFORM_DOUBLE_CLICK_EFFECT_MS = 135;
+    static constexpr uint32_t WAVEFORM_DOUBLE_CLICK_EFFECT_MS = 144;
     static constexpr uint32_t WAVEFORM_HEAVY_CLICK_EFFECT_MS = 8;
 
     static constexpr uint32_t DEFAULT_LRA_PERIOD = 262;
diff --git a/vibrator/drv2624/Vibrator.cpp b/vibrator/drv2624/Vibrator.cpp
index 7067b5ca..7fd26f6c 100644
--- a/vibrator/drv2624/Vibrator.cpp
+++ b/vibrator/drv2624/Vibrator.cpp
@@ -54,8 +54,8 @@ static constexpr char WAVEFORM_DOUBLE_CLICK_EFFECT_SEQ[] = "3 0";
 static constexpr char WAVEFORM_HEAVY_CLICK_EFFECT_SEQ[] = "4 0";
 
 // UT team design those target G values
-static constexpr std::array<float, 5> EFFECT_TARGET_G = {0.175, 0.325, 0.37, 0.475, 0.6};
-static constexpr std::array<float, 3> STEADY_TARGET_G = {1.38, 1.145, 0.905};
+static constexpr std::array<float, 5> EFFECT_TARGET_G = {0.13, 0.13, 0.25, 0.4, 0.57};
+static constexpr std::array<float, 3> STEADY_TARGET_G = {1.2, 1.145, 0.905};
 
 static std::uint32_t freqPeriodFormula(std::uint32_t in) {
     return 1000000000 / (24615 * in);
diff --git a/vibrator/drv2624/drv2624.bin b/vibrator/drv2624/drv2624.bin
index d70f6cb7..54f1ecb1 100644
Binary files a/vibrator/drv2624/drv2624.bin and b/vibrator/drv2624/drv2624.bin differ