diff --git a/debian/changelog b/debian/changelog
index 3239051..8d91dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tileos-system-adjustments (1.5~tileos) unstable; urgency=medium
+
+  * Disable Kyber scheduler for SSD and set mq-deadline
+  * Disable scheduler for NVMe
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Fri, 16 Feb 2024 17:55:41 +0400
+
 tileos-system-adjustments (1.4~tileos) unstable; urgency=medium
 
   * Add Zram config
diff --git a/etc/udev/rules.d/60-ioschedulers.rules b/etc/udev/rules.d/60-ioschedulers.rules
index d172247..0bca8f5 100644
--- a/etc/udev/rules.d/60-ioschedulers.rules
+++ b/etc/udev/rules.d/60-ioschedulers.rules
@@ -1,7 +1,6 @@
-# set scheduler for NVMe
-ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/scheduler}="kyber"
+# disable scheduler for NVMe
+ACTION=="add|change", KERNEL=="nvme[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="none"
 # set scheduler for SSD
-ACTION=="add|change", SUBSYSTEM=="block", ATTR{queue/rotational}=="0", KERNEL=="sd?", ATTR{queue/scheduler}="kyber"
-# set scheduler for rotating disks and SD cards
-ACTION=="add|change", SUBSYSTEM=="block", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq"
-ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="mmcblk?", ATTR{queue/scheduler}="bfq"
+ACTION=="add|change", KERNEL=="sd[a-z]*|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline"
+# set scheduler for HDD
+ACTION=="add|change", KERNEL=="sd[a-z]*", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq"