diff --git a/device/device-xiaomi-santoni/APKBUILD b/device/device-xiaomi-santoni/APKBUILD
index 3ee454457..c9398eafb 100644
--- a/device/device-xiaomi-santoni/APKBUILD
+++ b/device/device-xiaomi-santoni/APKBUILD
@@ -59,8 +59,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Wi-Fi, ADSP Firmware"
-	depends="firmware-xiaomi-santoni"
+	pkgdesc="Wi-Fi, ADSP Firmware (DON'T INSTALL IF USE **LIBHYBRIS**)"
+	depends="firmware-xiaomi-santoni wcnss-wlan adsp-audio"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/device-xiaomi-santoni/device-xiaomi-santoni-hybris.post-install b/device/device-xiaomi-santoni/device-xiaomi-santoni-hybris.post-install
index 3eeb5b9f3..08d7a5465 100644
--- a/device/device-xiaomi-santoni/device-xiaomi-santoni-hybris.post-install
+++ b/device/device-xiaomi-santoni/device-xiaomi-santoni-hybris.post-install
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+# We'll need to remove both services because someone might
+# not know that the firmware doesn't need to be installed for Hybris
+# to work. (these also contribute to the long boot times)
+rc-update del adsp-audio default
+rc-update del wcnss-wlan default
+
+# On this device, seems that refreshing the framebuffer creates artifacts
+# in test_hwcomposer, so this had to be disabled.
+rc-update del msm-fb-refresher boot
+
 # Append Android mounts to Linux fstab
 cat /etc/fstab.android >> /etc/fstab
 
@@ -10,7 +20,6 @@ mkdir -p /cache
 mkdir -p /persist
 mkdir -p /dsp
 mkdir -p /firmware
-mkdir -p /usb_otg
 
 # /vendor symlink (points to nowhere until /system is mounted)
 ln -s /system/vendor /vendor
diff --git a/firmware/firmware-xiaomi-santoni/APKBUILD b/firmware/firmware-xiaomi-santoni/APKBUILD
index 00c8f6336..233a1fba4 100644
--- a/firmware/firmware-xiaomi-santoni/APKBUILD
+++ b/firmware/firmware-xiaomi-santoni/APKBUILD
@@ -1,11 +1,10 @@
 pkgname=firmware-xiaomi-santoni
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Firmware files for Xiaomi Redmi 4X"
 url="https://postmarketos.org"
 arch="aarch64"
 license="proprietary"
-depends="wcnss-wlan adsp-audio"
 options="!strip !check !archcheck"
 
 # Source