diff --git a/overlay/etc/udev/rules.d/99-touchscreen-calibration.rules b/overlay/etc/udev/rules.d/99-touchscreen-calibration.rules
index 56b0d69..7b9bab4 100644
--- a/overlay/etc/udev/rules.d/99-touchscreen-calibration.rules
+++ b/overlay/etc/udev/rules.d/99-touchscreen-calibration.rules
@@ -1 +1 @@
-ACTION!="remove", SUBSYSTEM=="input", DEVPATH=="/devices/platform/soc/fe000000.apb4/fe050000.spi/spi_master/spi0/spi0.1/input/input4/event4", ENV{ID_INPUT_TOUCHSCREEN}=="1", ENV{LIBINPUT_CALIBRATION_MATRIX}="1.382308 0.050764 -0.072342 -0.013080 -2.273183 1.071859"
\ No newline at end of file
+ACTION=="add|change", SUBSYSTEM=="input", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", ENV{LIBINPUT_CALIBRATION_MATRIX}="1.382308 0.050764 -0.072342 -0.013080 -2.273183 1.071859"
\ No newline at end of file
diff --git a/overlay/usr/bin/calibration-helper b/overlay/usr/bin/calibration-helper
index a39b2b5..3962e8e 100755
--- a/overlay/usr/bin/calibration-helper
+++ b/overlay/usr/bin/calibration-helper
@@ -13,4 +13,4 @@ echo "$DEV_PATH"
 
 [ -z "$DEV_PATH" ] && exit 1
 
-echo "ACTION!=\"remove\", SUBSYSTEM==\"input\", DEVPATH==\"$DEV_PATH\", ENV{ID_INPUT_TOUCHSCREEN}==\"1\", ENV{LIBINPUT_CALIBRATION_MATRIX}=\"$MATRIX\"" > /etc/udev/rules.d/99-touchscreen-calibration.rules
+echo "ACTION==\"add|change\", SUBSYSTEM==\"input\", SUBSYSTEM==\"input\", KERNEL==\"event[0-9]*\", ENV{ID_INPUT_TOUCHSCREEN}==\"1\", ENV{LIBINPUT_CALIBRATION_MATRIX}=\"$MATRIX\"" > /etc/udev/rules.d/99-touchscreen-calibration.rules