diff --git a/projects/ROCKNIX/devices/S922X/options b/projects/ROCKNIX/devices/S922X/options
index ffba862061c..cd63cda52f5 100644
--- a/projects/ROCKNIX/devices/S922X/options
+++ b/projects/ROCKNIX/devices/S922X/options
@@ -42,7 +42,7 @@
     UBOOT_FIRMWARE="amlogic-boot-fip"
 
   # Mali GPU family
-    MALI_FAMILY="bifrost-g52"
+    MALI_FAMILY="amlogic"
     GRAPHIC_DRIVERS="panfrost"
 
   # For maximum cross compatbility
@@ -69,10 +69,10 @@
   # Additional Firmware to use ( )
   # Space separated list is supported,
   # e.g. FIRMWARE=""
-    FIRMWARE="libmali-amlogic"
+    FIRMWARE=""
 
   # Additional packages to install
-    ADDITIONAL_PACKAGES="weston-kiosk-shell-dpms"
+    ADDITIONAL_PACKAGES="libmali weston-kiosk-shell-dpms"
 
   # Debug tty path
     DEBUG_TTY="/dev/ttyAML0"
diff --git a/projects/ROCKNIX/packages/graphics/gpudriver/sources/bin/gpudriver b/projects/ROCKNIX/packages/graphics/gpudriver/sources/bin/gpudriver
index 24dbf0ea99e..0c45dddf0d0 100755
--- a/projects/ROCKNIX/packages/graphics/gpudriver/sources/bin/gpudriver
+++ b/projects/ROCKNIX/packages/graphics/gpudriver/sources/bin/gpudriver
@@ -32,10 +32,10 @@ load_driver() {
           grep -q /usr/lib/libEGL.so /proc/mounts && mount_required=false || mount_required=true
 
           if [[ $mount_required = true ]]; then
-            mount --bind /usr/lib/mali/libEGL.so.1.4.0        /usr/lib/libEGL.so.1.1.0
-            mount --bind /usr/lib/mali/libGLESv1_CM.so.1.1.0  /usr/lib/libGLESv1_CM.so.1.2.0
-            mount --bind /usr/lib/mali/libGLESv2.so.2.1.0     /usr/lib/libGLESv2.so.2.1.0
-            mount --bind /usr/lib/mali/libgbm.so.1.0.0        /usr/lib/libgbm.so.1.0.0
+            mount --bind /usr/lib/mali/libEGL.so.1        /usr/lib/libEGL.so.1.1.0
+            mount --bind /usr/lib/mali/libGLESv1_CM.so.1  /usr/lib/libGLESv1_CM.so.1.2.0
+            mount --bind /usr/lib/mali/libGLESv2.so.2     /usr/lib/libGLESv2.so.2.1.0
+            mount --bind /usr/lib/mali/libgbm.so.1        /usr/lib/libgbm.so.1.0.0
           fi
 
           # Deliberately break OpenGL checks
diff --git a/projects/ROCKNIX/packages/graphics/libmali/package.mk b/projects/ROCKNIX/packages/graphics/libmali/package.mk
index 3cf2754e014..2b86649c22c 100644
--- a/projects/ROCKNIX/packages/graphics/libmali/package.mk
+++ b/projects/ROCKNIX/packages/graphics/libmali/package.mk
@@ -5,11 +5,15 @@
 
 PKG_NAME="libmali"
 PKG_VERSION="g13p0"
+[[ "${DEVICE}" == "S922X" ]] && PKG_VERSION="r51p0-00eac0"
+[[ "${DEVICE}" == "S922X" ]] && PKG_ARCH="aarch64"
 PKG_LICENSE="nonfree"
-PKG_SITE="https://github.com/tsukumijima/libmali-rockchip"
+#PKG_SITE="https://github.com/ROCKNIX/libmali"
+PKG_SITE="https://github.com/porschemad911/rocknix-libmali"
 # zip format makes extract very fast (<1s). tgz takes 20 seconds to scan the whole file
 #PKG_URL="${PKG_SITE}/archive/refs/tags/${PKG_VERSION}.zip"
-PKG_URL="${PKG_SITE}/archive/master.zip"
+#PKG_URL="${PKG_SITE}/archive/master.zip"
+PKG_URL="${PKG_SITE}/archive/amlogic.zip"
 PKG_DEPENDS_TARGET="toolchain libdrm patchelf:host gpudriver"
 PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family"
 PKG_TOOLCHAIN="meson"
@@ -41,9 +45,9 @@ unpack() {
   pwd
   # Extract only what is needed
   LIBNAME="libmali-${MALI_FAMILY}-${PKG_VERSION}-${PLATFORM}.so"
-  unzip -q "${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME}" "*/hook/*" "*/include/*" "*/scripts/*" "*/meson*" "*/${LIBNAME}"
-  mv libmali-rockchip-*/* .
-  rmdir libmali-rockchip-*
+  unzip -q "${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME}" "*/data/*" "*/hook/*" "*/include/*" "*/scripts/*" "*/meson*" "*/${LIBNAME}"
+  mv rocknix-libmali*/* .
+  rmdir rocknix-libmali-*
   ln -s lib optimize_3
 }
 
@@ -61,4 +65,7 @@ post_makeinstall_target() {
   if [ ${DEVICE} = "RK3588" ] && [ ${TARGET_ARCH} = "aarch64" ]; then
       curl -Lo ${INSTALL}/usr/lib/libmali-${MALI_FAMILY}-${PKG_VERSION}-x11-gbm.so ${PKG_SITE}/raw/master/lib/aarch64-linux-gnu/libmali-${MALI_FAMILY}-${PKG_VERSION}-x11-gbm.so
   fi
+
+  # S922X - mali vulkan libs need moving
+  [[ "${DEVICE}" == "S922X" ]] && mv "${INSTALL}"/usr/lib/mali/libMaliVulkan.* "${INSTALL}"/usr/lib/
 }