diff --git a/device-oriole.mk b/device-oriole.mk
index 797c1ce..54845ab 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -52,13 +52,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
 	frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml
 
-# Vibrator HAL
-PRODUCT_PRODUCT_PROPERTIES +=\
-    ro.vendor.vibrator.hal.long.frequency.shift=15 \
-    ro.vendor.vibrator.hal.device.mass=0.205 \
-    ro.vendor.vibrator.hal.loc.coeff=2.25 \
-    persist.vendor.vibrator.hal.chirp.enabled=0
-
 PRODUCT_SOONG_NAMESPACES += \
     device/google/raviole
 
diff --git a/device-raven.mk b/device-raven.mk
index d3f6a2f..3d54336 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -59,13 +59,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
 	frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml
 
-# Vibrator HAL
-PRODUCT_PRODUCT_PROPERTIES +=\
-    ro.vendor.vibrator.hal.long.frequency.shift=15 \
-    ro.vendor.vibrator.hal.device.mass=0.21 \
-    ro.vendor.vibrator.hal.loc.coeff=2.5 \
-    persist.vendor.vibrator.hal.chirp.enabled=0
-
 PRODUCT_SOONG_NAMESPACES += \
     device/google/raviole
 
diff --git a/oriole/vendor.prop b/oriole/vendor.prop
index 661cfa9..abebb21 100644
--- a/oriole/vendor.prop
+++ b/oriole/vendor.prop
@@ -47,6 +47,10 @@ ro.vendor.touch.dump.sys=/sys/class/spi_master/spi11/spi11.0
 ro.usb.uvc.enabled=true
 
 # Vibrator
+persist.vendor.vibrator.hal.chirp.enabled=0
+ro.vendor.vibrator.hal.device.mass=0.205
+ro.vendor.vibrator.hal.loc.coeff=2.25
+ro.vendor.vibrator.hal.long.frequency.shift=15
 vendor.audio.hapticgenerator.distortion.output.gain=0.32
 
 # ZRAM
diff --git a/raven/vendor.prop b/raven/vendor.prop
index 49f36cd..b1cefbb 100644
--- a/raven/vendor.prop
+++ b/raven/vendor.prop
@@ -48,6 +48,10 @@ ro.usb.uvc.enabled=true
 ro.vendor.uwb.calibration.calibrationpaths=/vendor/etc/uwb/calib_paths
 
 # Vibrator
+persist.vendor.vibrator.hal.chirp.enabled=0
+ro.vendor.vibrator.hal.device.mass=0.21
+ro.vendor.vibrator.hal.loc.coeff=2.5
+ro.vendor.vibrator.hal.long.frequency.shift=15
 vendor.audio.hapticgenerator.distortion.output.gain=0.32
 
 # ZRAM