diff --git a/debian/control b/debian/control
index 910bfc0..ce58fc6 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,46 @@ Homepage: https://github.com/rockchip-linux/libmali
 Vcs-Git: https://github.com/rockchip-linux/libmali
 Vcs-Browser: https://github.com/rockchip-linux/libmali
 
+Package: libmali-bifrost-g31-g2p0-gbm
+Architecture: armhf arm64
+Provides: libmali
+Conflicts: libmali
+Replaces: libmali
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Mali GPU User-Space Binary Drivers
+
+Package: libmali-bifrost-g31-g2p0-only-cl
+Architecture: armhf arm64
+Provides: libmali
+Conflicts: libmali
+Replaces: libmali
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Mali GPU User-Space Binary Drivers
+
+Package: libmali-bifrost-g31-g2p0-wayland
+Architecture: armhf arm64
+Provides: libmali
+Conflicts: libmali
+Replaces: libmali
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Mali GPU User-Space Binary Drivers
+
+Package: libmali-bifrost-g31-g2p0-without-cl-wayland
+Architecture: armhf arm64
+Provides: libmali
+Conflicts: libmali
+Replaces: libmali
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Mali GPU User-Space Binary Drivers
+
+Package: libmali-bifrost-g31-g2p0-x11
+Architecture: armhf arm64
+Provides: libmali
+Conflicts: libmali
+Replaces: libmali
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Mali GPU User-Space Binary Drivers
+
 Package: libmali-bifrost-g31-rxp0-gbm
 Architecture: armhf arm64
 Provides: libmali
diff --git a/debian/targets b/debian/targets
index 95113f7..2b53d55 100644
--- a/debian/targets
+++ b/debian/targets
@@ -1,59 +1,69 @@
-arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-x11.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r1p0-x11.so
-arm-linux-gnueabihf/libmali-utgard-400-r7p0-r3p0-wayland.so
-arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-without-cl-wayland.so
-arm-linux-gnueabihf/libmali-utgard-450-r7p0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t86x-r18p0-x11.so
-arm-linux-gnueabihf/libmali-midgard-t86x-r14p0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t86x-r18p0-gbm.so
-arm-linux-gnueabihf/libmali-midgard-t86x-r14p0-x11.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r1p0-x11.so
-arm-linux-gnueabihf/libmali-utgard-450-r7p0-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-gbm.so
-arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-x11.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-dummy.so
-arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-only-cl.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-x11.so
-arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t86x-r14p0-gbm.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r0p0-wayland.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-dummy-gbm.so
-arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-wayland.so
-arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-gbm.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r1p0-gbm.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r1p0-wayland.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-x11.so
-arm-linux-gnueabihf/libmali-utgard-450-r7p0-x11.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t86x-r18p0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r1p0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r0p0-x11.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-without-cl-dummy-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-wayland.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r1p0-gbm.so
-arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r0p0-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-rxp0-x11.so
-aarch64-linux-gnu/libmali-bifrost-g52-r25p0-x11.so
-aarch64-linux-gnu/libmali-bifrost-g52-r25p0-wayland.so
-aarch64-linux-gnu/libmali-bifrost-g52-r25p0-dummy.so
-aarch64-linux-gnu/libmali-bifrost-g31-rxp0-without-cl-wayland.so
-aarch64-linux-gnu/libmali-utgard-450-r7p0-wayland.so
-aarch64-linux-gnu/libmali-midgard-t86x-r18p0-x11.so
-aarch64-linux-gnu/libmali-midgard-t86x-r14p0-wayland.so
-aarch64-linux-gnu/libmali-midgard-t86x-r18p0-gbm.so
-aarch64-linux-gnu/libmali-midgard-t86x-r14p0-x11.so
-aarch64-linux-gnu/libmali-utgard-450-r7p0-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g2p0-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g2p0-dummy.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-only-cl.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-wayland.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-without-cl-wayland.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-x11.so
+aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-rxp0-only-cl.so
 aarch64-linux-gnu/libmali-bifrost-g31-rxp0-wayland.so
-aarch64-linux-gnu/libmali-midgard-t86x-r14p0-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g31-rxp0-without-cl-wayland.so
+aarch64-linux-gnu/libmali-bifrost-g31-rxp0-x11.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-dummy-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g2p0-x11.so
-aarch64-linux-gnu/libmali-utgard-450-r7p0-x11.so
-aarch64-linux-gnu/libmali-midgard-t86x-r18p0-wayland.so
-aarch64-linux-gnu/libmali-bifrost-g52-g2p0-without-cl-dummy-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g52-g2p0-dummy.so
+aarch64-linux-gnu/libmali-bifrost-g52-g2p0-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-wayland.so
+aarch64-linux-gnu/libmali-bifrost-g52-g2p0-without-cl-dummy-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g52-g2p0-x11.so
+aarch64-linux-gnu/libmali-bifrost-g52-r25p0-dummy.so
+aarch64-linux-gnu/libmali-bifrost-g52-r25p0-wayland.so
+aarch64-linux-gnu/libmali-bifrost-g52-r25p0-x11.so
+aarch64-linux-gnu/libmali-midgard-t86x-r14p0-gbm.so
+aarch64-linux-gnu/libmali-midgard-t86x-r14p0-wayland.so
+aarch64-linux-gnu/libmali-midgard-t86x-r14p0-x11.so
+aarch64-linux-gnu/libmali-midgard-t86x-r18p0-gbm.so
+aarch64-linux-gnu/libmali-midgard-t86x-r18p0-wayland.so
+aarch64-linux-gnu/libmali-midgard-t86x-r18p0-x11.so
+aarch64-linux-gnu/libmali-utgard-450-r7p0-gbm.so
+aarch64-linux-gnu/libmali-utgard-450-r7p0-wayland.so
+aarch64-linux-gnu/libmali-utgard-450-r7p0-x11.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-only-cl.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-wayland.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-without-cl-wayland.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-x11.so
+arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-only-cl.so
+arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-wayland.so
+arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-without-cl-wayland.so
+arm-linux-gnueabihf/libmali-bifrost-g31-rxp0-x11.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-dummy-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-dummy.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-wayland.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-without-cl-dummy-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-x11.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r0p0-gbm.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r0p0-wayland.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r0p0-x11.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r1p0-gbm.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r1p0-wayland.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r14p0-r1p0-x11.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-gbm.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-wayland.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-x11.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r1p0-gbm.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r1p0-wayland.so
+arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r1p0-x11.so
+arm-linux-gnueabihf/libmali-midgard-t86x-r14p0-gbm.so
+arm-linux-gnueabihf/libmali-midgard-t86x-r14p0-wayland.so
+arm-linux-gnueabihf/libmali-midgard-t86x-r14p0-x11.so
+arm-linux-gnueabihf/libmali-midgard-t86x-r18p0-gbm.so
+arm-linux-gnueabihf/libmali-midgard-t86x-r18p0-wayland.so
+arm-linux-gnueabihf/libmali-midgard-t86x-r18p0-x11.so
+arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-gbm.so
+arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-wayland.so
+arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-x11.so
+arm-linux-gnueabihf/libmali-utgard-400-r7p0-r3p0-wayland.so
+arm-linux-gnueabihf/libmali-utgard-450-r7p0-gbm.so
+arm-linux-gnueabihf/libmali-utgard-450-r7p0-wayland.so
+arm-linux-gnueabihf/libmali-utgard-450-r7p0-x11.so
diff --git a/update_debian.sh b/update_debian.sh
index 38ccb54..ca40d38 100755
--- a/update_debian.sh
+++ b/update_debian.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Generate targets and packages
-find lib -type f | sed 's,^lib/,,' > debian/targets
+find lib -type f | sed 's,^lib/,,' | sort > debian/targets
 TARGETS=$(cat debian/targets)
 PACKAGES=$(cat debian/targets | sed "s/.*\(libmali.*\).so/\1/" | sort | uniq)