diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..836618b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+debian/.debhelper/
+debian/debhelper-build-stamp
+debian/files
+debian/tileos-system-adjustments.substvars
+debian/tileos-system-adjustments/
diff --git a/etc/modules-load.d/bfq.conf b/etc/modules-load.d/bfq.conf
deleted file mode 100644
index 4cb1c99..0000000
--- a/etc/modules-load.d/bfq.conf
+++ /dev/null
@@ -1 +0,0 @@
-bfq
diff --git a/etc/modules-load.d/iosched-modules.conf b/etc/modules-load.d/iosched-modules.conf
new file mode 100644
index 0000000..73aaac0
--- /dev/null
+++ b/etc/modules-load.d/iosched-modules.conf
@@ -0,0 +1,2 @@
+bfq
+kyber-iosched
diff --git a/etc/udev/rules.d/60-ioschedulers.rules b/etc/udev/rules.d/60-ioschedulers.rules
index 7c28101..d172247 100644
--- a/etc/udev/rules.d/60-ioschedulers.rules
+++ b/etc/udev/rules.d/60-ioschedulers.rules
@@ -1,6 +1,7 @@
 # set scheduler for NVMe
-ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/scheduler}="none"
-# set scheduler for SSD and eMMC
-ACTION=="add|change", KERNEL=="sd[a-z]*|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline"
-# set scheduler for rotating disks
-ACTION=="add|change", KERNEL=="sd[a-z]*", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq"
+ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/scheduler}="kyber"
+# 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"