diff --git a/BoardConfig.mk b/BoardConfig.mk
index 55f29bd..e5a40b6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -34,9 +34,6 @@ BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)
 BOARD_MOT_DP_GROUP_SIZE := 9827254272 # (BOARD_SUPER_PARTITION_SIZE - 4MB)
 BOARD_SUPER_PARTITION_SIZE := 9831448576
 
-# Power
-TARGET_TAP_TO_WAKE_NODE := /sys/class/touchscreen/primary/gesture
-
 # Properties
 TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop
 TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
diff --git a/device.mk b/device.mk
index f451511..febd44a 100644
--- a/device.mk
+++ b/device.mk
@@ -70,6 +70,9 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
     frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
 
+# Power
+$(call soong_config_set,qtipower,tap_to_wake_node,/sys/class/touchscreen/primary/gesture)
+
 # Sensors
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf