diff --git a/Makefile b/Makefile
index 66813ecda..a80fec78e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ RK3566:
 	PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro
 
 S922X:
-	PROJECT=Amlogic DEVICE=S922X ARCH=arm ./scripts/build_distro
 	PROJECT=Amlogic DEVICE=S922X ARCH=aarch64 ./scripts/build_distro
 
 update:
diff --git a/packages/emulators/libretro/flycast-lr/package.mk b/packages/emulators/libretro/flycast-lr/package.mk
index 9133d9477..47ff3dc2f 100644
--- a/packages/emulators/libretro/flycast-lr/package.mk
+++ b/packages/emulators/libretro/flycast-lr/package.mk
@@ -43,7 +43,9 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib/libretro
   case ${TARGET_ARCH} in
     aarch64)
-      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/flycast-lr-*/.install_pkg/usr/lib/libretro/flycast32_libretro.so ${INSTALL}/usr/lib/libretro
+      if [ -f ${ROOT}/build.${DISTRO}-${DEVICE}.arm/flycast-lr-*/.install_pkg/usr/lib/libretro/flycast32_libretro.so ]; then
+        cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/flycast-lr-*/.install_pkg/usr/lib/libretro/flycast32_libretro.so ${INSTALL}/usr/lib/libretro
+      fi
       cp flycast_libretro.so ${INSTALL}/usr/lib/libretro/flycast_libretro.so
     ;;
     arm)
diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
index 54fe9432a..d0c317135 100644
--- a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
+++ b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
@@ -22,7 +22,7 @@ makeinstall_target() {
   ## Install the 64bit core.
   mkdir -p ${INSTALL}/usr/lib/libretro
   cp pcsx_rearmed_libretro.so ${INSTALL}/usr/lib/libretro/
-  if [ "${TARGET_ARCH}" = "aarch64" ]
+  if [ "${TARGET_ARCH}" = "aarch64" ] && [ ! ${DEVICE} = 'S922X' ]
   then
     cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/pcsx_rearmed-lr-*/.install_pkg/usr/lib/libretro/pcsx_rearmed_libretro.so ${INSTALL}/usr/lib/libretro/pcsx_rearmed32_libretro.so
   fi
diff --git a/packages/emulators/standalone/retroarch/package.mk b/packages/emulators/standalone/retroarch/package.mk
index f871be236..f816673c7 100644
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@@ -88,9 +88,11 @@ makeinstall_target() {
 
   case ${ARCH} in
     aarch64)
-     cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ${INSTALL}/usr/bin/retroarch32
-     mkdir -p ${INSTALL}/usr/share/retroarch/filters/32bit/
-     cp -rvP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/share/retroarch/filters/64bit/* ${INSTALL}/usr/share/retroarch/filters/32bit/
+      if [ -f ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ]; then
+        cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ${INSTALL}/usr/bin/retroarch32
+        mkdir -p ${INSTALL}/usr/share/retroarch/filters/32bit/
+        cp -rvP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/share/retroarch/filters/64bit/* ${INSTALL}/usr/share/retroarch/filters/32bit/
+      fi
     ;;
   esac
 
diff --git a/packages/jelos/package.mk b/packages/jelos/package.mk
index b83eb396e..9e30ffc78 100644
--- a/packages/jelos/package.mk
+++ b/packages/jelos/package.mk
@@ -24,7 +24,14 @@ PKG_UI_TOOLS="fileman"
 
 PKG_SOFTWARE=""
 
-PKG_COMPAT="lib32"
+case "${DEVICE}" in
+  S922X)
+    #aarch64 ONLY
+  ;;
+  *)
+    PKG_COMPAT="lib32"
+  ;;
+esac
 
 PKG_MULTIMEDIA="ffmpeg vlc mpv"
 
diff --git a/packages/kernel/linux-drivers/RTL8812AU/package.mk b/packages/kernel/linux-drivers/RTL8812AU/package.mk
index bf9d2a5d9..3b7e6b5f6 100644
--- a/packages/kernel/linux-drivers/RTL8812AU/package.mk
+++ b/packages/kernel/linux-drivers/RTL8812AU/package.mk
@@ -4,7 +4,7 @@
 # Copyright (C) 2021-present Fewtarius
 
 PKG_NAME="RTL8812AU"
-PKG_VERSION="7b2946304933d593feb01d50fea71065d90973b0"
+PKG_VERSION="a185a595248926eda0796104fa8417c6248bfd60"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/morrownr/8812au-20210629"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index 26068d33b..c8773047c 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -44,7 +44,7 @@ case "${DEVICE}" in
     PKG_EMUS+=" yabasanshiro-sa"
   ;;
   S922X)
-    PKG_EMUS+=" aethersx2-sa dolphin-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box86 box64"
+    PKG_EMUS+=" aethersx2-sa dolphin-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box64"
     LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr pcsx_rearmed-lr yabasanshiro-sa"
 esac
 
diff --git a/projects/Amlogic/options b/projects/Amlogic/options
new file mode 100755
index 000000000..6790d59c9
--- /dev/null
+++ b/projects/Amlogic/options
@@ -0,0 +1,70 @@
+################################################################################
+# setup system defaults
+################################################################################
+
+  # Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
+    BOOTLOADER="u-boot"
+
+  # Kernel extra targets to build
+    KERNEL_UBOOT_EXTRA_TARGET=""
+
+  # Kernel to use. values can be:
+  # default:  default mainline kernel
+    LINUX=""
+
+################################################################################
+# setup build defaults
+################################################################################
+
+  # Project FLAGS
+    PROJECT_CFLAGS=""
+
+  # SquashFS compression method (gzip / lzo / xz)
+    SQUASHFS_COMPRESSION="lzo"
+
+################################################################################
+# setup project defaults
+################################################################################
+
+  # build and install ALSA Audio support (yes / no)
+    ALSA_SUPPORT="yes"
+
+  # OpenGL(X) implementation to use (no / mesa)
+    OPENGL="mesa"
+
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="mesa"
+
+  # Displayserver to use (weston / no)
+    DISPLAYSERVER="wl"
+
+  # Windowmanager to use (fluxbox / none)
+    WINDOWMANAGER="weston"
+
+  # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
+  # Space separated list is supported,
+  # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
+    GRAPHIC_DRIVERS=""
+
+  # Modules to install in initramfs for early boot
+    INITRAMFS_MODULES=""
+
+  # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
+  # Space separated list is supported,
+  # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+    FIRMWARE="misc-firmware wlan-firmware"
+
+  # additional packages to install
+    ADDITIONAL_PACKAGES=""
+
+  # build and install CEC framework support (yes / no)
+    CEC_FRAMEWORK_SUPPORT="yes"
+
+  # build with installer (yes / no)
+    INSTALLER_SUPPORT="no"
+
+  # build and install driver addons (yes / no)
+    DRIVER_ADDONS_SUPPORT="no"
+
+  # debug tty path
+    DEBUG_TTY="/dev/ttyS2"
diff --git a/projects/Amlogic/packages/linux/patches/S922X/000-ogu-linux.patch b/projects/Amlogic/packages/linux/patches/S922X/000-ogu-linux.patch
index 021ad8157..30a309bfa 100644
--- a/projects/Amlogic/packages/linux/patches/S922X/000-ogu-linux.patch
+++ b/projects/Amlogic/packages/linux/patches/S922X/000-ogu-linux.patch
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
 diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot/dts/amlogic/Makefile
 --- linux.orig/arch/arm64/boot/dts/amlogic/Makefile	2023-03-22 12:34:07.000000000 +0000
 +++ linux/arch/arm64/boot/dts/amlogic/Makefile	2023-03-31 16:27:15.048741724 +0000
diff --git a/projects/Amlogic/packages/linux/sysctl.d/network.conf b/projects/Amlogic/packages/linux/sysctl.d/network.conf
new file mode 100644
index 000000000..3518d6d96
--- /dev/null
+++ b/projects/Amlogic/packages/linux/sysctl.d/network.conf
@@ -0,0 +1 @@
+net.ipv4.tcp_no_metrics_save=1
diff --git a/projects/Amlogic/packages/linux/sysctl.d/qdisc.conf b/projects/Amlogic/packages/linux/sysctl.d/qdisc.conf
new file mode 100644
index 000000000..ffd7273d3
--- /dev/null
+++ b/projects/Amlogic/packages/linux/sysctl.d/qdisc.conf
@@ -0,0 +1 @@
+net.core.default_qdisc = fq_codel
diff --git a/projects/Amlogic/packages/linux/udev.d/30-disable-wakeup.rules b/projects/Amlogic/packages/linux/udev.d/30-disable-wakeup.rules
new file mode 100644
index 000000000..817e5661e
--- /dev/null
+++ b/projects/Amlogic/packages/linux/udev.d/30-disable-wakeup.rules
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+ACTION!="add|change", GOTO="end"
+
+DRIVER=="ehci-pci|xhci_hcd", RUN+="/usr/bin/sh -c 'echo disabled > /sys$devpath/power/wakeup'"
+
+LABEL="end"
diff --git a/projects/Amlogic/packages/linux/udev.d/40-usb_modeswitch.rules b/projects/Amlogic/packages/linux/udev.d/40-usb_modeswitch.rules
new file mode 100644
index 000000000..4034ac72b
--- /dev/null
+++ b/projects/Amlogic/packages/linux/udev.d/40-usb_modeswitch.rules
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+
+ACTION!="add|change", GOTO="end_modeswitch"
+
+# Atheros Wireless / Netgear WNDA3200
+ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/usr/bin/eject '/dev/%k'"
+
+# Realtek RTL8821CU chipset 802.11ac NIC
+#   initial cdrom mode 0bda:1a2b, wlan mode 0bda:c811
+# Odroid WiFi Module 5B
+#   initial cdrom mode 0bda:1a2b, wlan mode 0bda:c820
+ATTR{idVendor}=="0bda", ATTR{idProduct}=="1a2b", RUN+="/usr/sbin/usb_modeswitch -K -v 0bda -p 1a2b"
+ATTR{idVendor}=="0bda", ATTR{idProduct}=="c811", RUN+="/usr/sbin/usb_modeswitch -K -v 0bda -p c811"
+
+LABEL="end_modeswitch"