diff --git a/BoardConfig.mk b/BoardConfig.mk
index df5911a..caee12c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,10 +36,6 @@ BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 # Properties
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
-# Vibrator
-TARGET_QTI_VIBRATOR_EFFECT_LIB := libqtivibratoreffect.xiaomi
-TARGET_QTI_VIBRATOR_USE_EFFECT_STREAM := true
-
 # Include proprietary files
 include vendor/xiaomi/haydn/BoardConfigVendor.mk
 
diff --git a/device.mk b/device.mk
index 9312567..20730a1 100644
--- a/device.mk
+++ b/device.mk
@@ -45,6 +45,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
+# Vibrator
+$(call soong_config_set,qti_vibrator,effect_lib,libqtivibratoreffect.xiaomi)
+$(call soong_config_set,qti_vibrator,use_effect_stream,true)
+
 # Call the proprietary setup
 $(call inherit-product, vendor/xiaomi/haydn/haydn-vendor.mk)