diff --git a/distributions/ROCKNIX/config/functions b/distributions/ROCKNIX/config/functions
index c807a3e867..4b12bb99e3 100644
--- a/distributions/ROCKNIX/config/functions
+++ b/distributions/ROCKNIX/config/functions
@@ -283,7 +283,7 @@ function savedefault {
 
 set timeout_style=menu
 set lang=en_US
-loadfont /boot/grub/dejavu-mono.pf2
+loadfont /EFI/BOOT/dejavu-mono.pf2
 set rotation=270
 set gfxmode=auto
 insmod efi_gop
@@ -302,7 +302,7 @@ menuentry '${FULL}' \$menuentry_id_option '${SHORT}' {
         savedefault
         search --set -f /KERNEL
         linux /KERNEL boot=LABEL=${DISTRO_BOOTLABEL} disk=LABEL=${DISTRO_DISKLABEL} grub_portable ${EXTRA_CMDLINE}
-        devicetree /boot/grub/${DTB}.dtb
+        devicetree /${DTB}.dtb
 }
 EOF
   done
@@ -314,7 +314,7 @@ EOF
 menuentry '${FULL} RECOVERY' \$menuentry_id_option '${SHORT}-recovery' {
         search --set -f /KERNEL
         linux /KERNEL boot=LABEL=${DISTRO_BOOTLABEL} disk=LABEL=${DISTRO_DISKLABEL} grub_portable ${EXTRA_CMDLINE} recovery
-        devicetree /boot/grub/${DTB}.dtb
+        devicetree /${DTB}.dtb
 }
 EOF
   done
diff --git a/projects/ROCKNIX/devices/SDM845/bootloader/update.sh b/projects/ROCKNIX/devices/SDM845/bootloader/update.sh
index aae4be95be..992c00f54a 100644
--- a/projects/ROCKNIX/devices/SDM845/bootloader/update.sh
+++ b/projects/ROCKNIX/devices/SDM845/bootloader/update.sh
@@ -17,8 +17,8 @@ fi
 mount -o remount,rw $BOOT_ROOT
 
 echo "Updating device trees..."
-for dtb in $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb; do
-  cp -p $dtb $BOOT_ROOT/boot/grub
+for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
+  cp -p $dtb $BOOT_ROOT
 done
 
 if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
@@ -26,20 +26,20 @@ if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
   cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg" ]; then
   echo "Updating grub.cfg..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2" ]; then
   echo "Updating dejavu-mono.pf2..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2 $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then
-  if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv" ]; then
+  if [ ! -f "$BOOT_ROOT/efi/boot/grubenv" ]; then
     echo "Installing grubenv..."
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv $BOOT_ROOT/EFI/BOOT
   fi
 fi
 
diff --git a/projects/ROCKNIX/devices/SM8250/bootloader/update.sh b/projects/ROCKNIX/devices/SM8250/bootloader/update.sh
index aae4be95be..992c00f54a 100755
--- a/projects/ROCKNIX/devices/SM8250/bootloader/update.sh
+++ b/projects/ROCKNIX/devices/SM8250/bootloader/update.sh
@@ -17,8 +17,8 @@ fi
 mount -o remount,rw $BOOT_ROOT
 
 echo "Updating device trees..."
-for dtb in $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb; do
-  cp -p $dtb $BOOT_ROOT/boot/grub
+for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
+  cp -p $dtb $BOOT_ROOT
 done
 
 if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
@@ -26,20 +26,20 @@ if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
   cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg" ]; then
   echo "Updating grub.cfg..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2" ]; then
   echo "Updating dejavu-mono.pf2..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2 $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then
-  if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv" ]; then
+  if [ ! -f "$BOOT_ROOT/efi/boot/grubenv" ]; then
     echo "Installing grubenv..."
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv $BOOT_ROOT/EFI/BOOT
   fi
 fi
 
diff --git a/projects/ROCKNIX/devices/SM8550/bootloader/update.sh b/projects/ROCKNIX/devices/SM8550/bootloader/update.sh
index b12cb951ad..e681b1a59f 100755
--- a/projects/ROCKNIX/devices/SM8550/bootloader/update.sh
+++ b/projects/ROCKNIX/devices/SM8550/bootloader/update.sh
@@ -17,8 +17,8 @@ fi
 mount -o remount,rw $BOOT_ROOT
 
 echo "Updating device trees..."
-for dtb in $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb; do
-  cp -p $dtb $BOOT_ROOT/boot/grub
+for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
+  cp -p $dtb $BOOT_ROOT
 done
 
 if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
@@ -26,20 +26,20 @@ if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
   cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg" ]; then
   echo "Updating grub.cfg..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2" ]; then
   echo "Updating dejavu-mono.pf2..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2 $BOOT_ROOT/EFI/BOOT
 fi
 
-if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then
-  if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then
+if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv" ]; then
+  if [ ! -f "$BOOT_ROOT/efi/boot/grubenv" ]; then
     echo "Installing grubenv..."
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv $BOOT_ROOT/EFI/BOOT
   fi
 fi
 
diff --git a/projects/ROCKNIX/packages/linux/package.mk b/projects/ROCKNIX/packages/linux/package.mk
index a028fa1e19..bafef5eeef 100644
--- a/projects/ROCKNIX/packages/linux/package.mk
+++ b/projects/ROCKNIX/packages/linux/package.mk
@@ -326,26 +326,18 @@ makeinstall_target() {
   rm -f ${INSTALL}/$(get_kernel_overlay_dir)/lib/modules/*/build
   rm -f ${INSTALL}/$(get_kernel_overlay_dir)/lib/modules/*/source
 
-  if [ "${BOOTLOADER}" = "arm-efi" ]; then
-    mkdir -p ${INSTALL}/usr/share/bootloader/boot/grub
-    for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/**/*.dtb; do
-      if [ -f ${dtb} ]; then
-          cp -v ${dtb} ${INSTALL}/usr/share/bootloader/boot/grub
-      fi
-    done
-  fi
-
-  if [ "${BOOTLOADER}" = "u-boot" ]; then
+  if [ "${BOOTLOADER}" = "u-boot" -o "${BOOTLOADER}" = "arm-efi" ]; then
     mkdir -p ${INSTALL}/usr/share/bootloader
-    for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/**/*.dtb; do
+    for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do
       if [ -f ${dtb} ]; then
         if [ "${DEVICE}" = "H700" -o "${DEVICE}" = "RK3326" -o "${DEVICE}" = "RK3399" -o "${DEVICE}" = "RK3566" -o "${DEVICE}" = "RK3588" ]; then
           mkdir -p ${INSTALL}/usr/share/bootloader/device_trees
           cp -v ${dtb} ${INSTALL}/usr/share/bootloader/device_trees
+        else
+          cp -v ${dtb} ${INSTALL}/usr/share/bootloader
         fi
       fi
     done
   fi
-
   makeinstall_host
 }
diff --git a/projects/ROCKNIX/packages/tools/grub/package.mk b/projects/ROCKNIX/packages/tools/grub/package.mk
index fb6d850d6f..38d6c075b0 100644
--- a/projects/ROCKNIX/packages/tools/grub/package.mk
+++ b/projects/ROCKNIX/packages/tools/grub/package.mk
@@ -69,17 +69,16 @@ make_target() {
 }
 
 makeinstall_target() {
-  ${PKG_BUILD}/.${HOST_NAME}/grub-mkimage -d grub-core -o bootaa64.efi -O arm64-efi -p /boot/grub \
+  ${PKG_BUILD}/.${HOST_NAME}/grub-mkimage -d grub-core -o bootaa64.efi -O arm64-efi -p /EFI/BOOT \
     boot linux ext2 fat squash4 part_msdos part_gpt normal search search_fs_file search_fs_uuid \
     search_label chain reboot loadenv test gfxterm efi_gop
 
-  mkdir -p ${INSTALL}/usr/share/bootloader/boot/grub
-  cp -av ${PKG_DIR}/config/* ${INSTALL}/usr/share/bootloader/boot/grub
   mkdir -p ${INSTALL}/usr/share/bootloader/EFI/BOOT
+  cp -av ${PKG_DIR}/config/* ${INSTALL}/usr/share/bootloader/EFI/BOOT
   cp -av bootaa64.efi ${INSTALL}/usr/share/bootloader/EFI/BOOT
 
   # Create grub configuration
-  generate_grub_cfg_body > "${INSTALL}/usr/share/bootloader/boot/grub/grub.cfg"
+  generate_grub_cfg_body > "${INSTALL}/usr/share/bootloader/EFI/BOOT/grub.cfg"
 
   # Always install the update script
   find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader