diff --git a/boot.cmd b/boot.cmd
index 80732bd..357f45e 100644
--- a/boot.cmd
+++ b/boot.cmd
@@ -1,25 +1,24 @@
 # DO NOT EDIT THIS FILE
 #
-# Please edit /boot/orangepiEnv.txt to set supported parameters
+# Please edit /boot/uEnv.txt to set supported parameters
 #
 
 setenv load_addr "0x9000000"
 setenv overlay_error "false"
 # default values
-setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
 setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"
-setenv uname_r "-5.10.160-1.el9.aarch64+64k"
-setenv other_uname_r "-5.10.160"
+setenvrootdev
+setenvunamer
 
 echo "Boot script loaded from ${devtype} ${devnum}"
 
-if test -e ${devtype} ${devnum} ${prefix}orangepiEnv.txt; then
-	load ${devtype} ${devnum} ${load_addr} ${prefix}orangepiEnv.txt
+if test -e ${devtype} ${devnum} ${prefix}uEnv.txt; then
+	load ${devtype} ${devnum} ${load_addr} ${prefix}uEnv.txt
 	env import -t ${load_addr} ${filesize}
 fi
 
@@ -43,14 +42,14 @@ if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgro
 
 #load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
 #load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
-load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd${uname_r}
-load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}vmlinuz${other_uname_r}
+load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd${unamer}
+load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}vmlinuz${unamer}
 
-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb${uname_r}/${fdtfile}
+load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb${uname_r}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
@@ -63,9 +62,9 @@ for overlay_file in ${user_overlays}; do
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb${uname_r}/${fdtfile}
+	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile}
 else
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb${uname_r}/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-fixup.scr; then
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi