diff --git a/device/testing/device-samsung-matisseve/APKBUILD b/device/testing/device-samsung-matisseve/APKBUILD
index a8e64954c..a2236ab5e 100644
--- a/device/testing/device-samsung-matisseve/APKBUILD
+++ b/device/testing/device-samsung-matisseve/APKBUILD
@@ -1,15 +1,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-matisseve
 pkgdesc="Samsung Galaxy Tab 4 10.1"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 soc-qcom-msm8916"
 makedepends="devicepkg-dev"
-source="deviceinfo modprobe.conf"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -26,8 +26,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-
 sha512sums="
-fce55e16d1e6b944b9f1e35b02371c36994c1d29fcc2812584115b9e9e94079a11d3bf91a1e269b29cc7db941ae8b30e3ee741c39997477b447983087d5feab8  deviceinfo
-d61d5de91025782fd65d257b17418de8b72f05853f72a40a5d3889f098c8bb82a7c90696b980e9e276e0b8f57b5137ea7348b5d8dc30f519c42f3af2956d2318  modprobe.conf
+1e9222a9f0681ebf8ba2d6e3def49c9fbfb244bf384bfb302f38bb09ca71a49220682195c3dde711754da244dba6053abf37785f6c290b99ef2e269191ed4a12  deviceinfo
 "
diff --git a/device/testing/device-samsung-matisseve/deviceinfo b/device/testing/device-samsung-matisseve/deviceinfo
index caa373a00..0dd759cbf 100644
--- a/device/testing/device-samsung-matisseve/deviceinfo
+++ b/device/testing/device-samsung-matisseve/deviceinfo
@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-matisseve"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/apq8016-samsung-matissevewifi"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-simple msm atmel_mxt_ts"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -19,9 +20,6 @@ deviceinfo_screen_width="1280"
 deviceinfo_screen_height="800"
 deviceinfo_getty="ttyMSM0;115200"
 
-# MSM DRM cannot take over the framebuffer from the bootloader at the moment
-deviceinfo_no_framebuffer="true"
-
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
diff --git a/device/testing/device-samsung-matisseve/modprobe.conf b/device/testing/device-samsung-matisseve/modprobe.conf
deleted file mode 100644
index 1fa06d71b..000000000
--- a/device/testing/device-samsung-matisseve/modprobe.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# There is a weird probe issue if both MSM DRM and the panel driver are built
-# as modules: When MSM DRM is loaded it registers the DSI bus for the panel.
-# At this point the panel is not loaded yet, so the kernel sends an uevent
-# to userspace to load the necessary panel module.
-#
-# This causes some delay until the panel module is loaded, so MSM DRM fails to
-# probe temporarily and returns -EPROBE_DEFER (to request probing again later).
-# Unfortunately this will also unregister the DSI bus for the panel, and the
-# kernel will not try probing MSM DRM + panel again until some other (slow)
-# driver loads after MSM DRM.
-#
-# Usually WCNSS (WiFi/BT) fits that criteria, allowing the display to work.
-# But this does not work if the user decides to exclude proprietary firmware.
-#
-# To avoid this problem we add an explicit soft dependency for MSM DRM
-# on the panel module, so modprobe loads the panel module first and MSM DRM
-# will immediately find the panel it is looking for.
-#
-softdep msm pre: panel-samsung-tc358764-ltl101al06