diff --git a/boot.cmd b/boot.cmd
index d1a9922..9d18461 100644
--- a/boot.cmd
+++ b/boot.cmd
@@ -6,13 +6,14 @@
 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"
+setenvrootdev
+setenvunamer
 
 echo "Boot script loaded from ${devtype} ${devnum}"
 
diff --git a/opi5-efi.spec b/opi5-efi.spec
index dabb620..6e090e9 100644
--- a/opi5-efi.spec
+++ b/opi5-efi.spec
@@ -34,6 +34,10 @@ set -xeuf -o pipefail
 if [ -f /boot/.uname ]; then
     UNAME_R=$(</boot/.uname)
     BOOT_PART=$(grep '/ ' /etc/fstab | awk '{print $1}')
+
+    echo "${BOOT_PART}" >> /boot/uEnv.txt-%{full_ver}
+    sed -i "s/setenvrootdev/setenv rootdev \"${BOOT_PART}\"/" /boot/boot.cmd-%{full_ver}
+    sed -i "s/setenvunamer/setenv unamer \"${UNAME_R}\"/" /boot/boot.cmd-%{full_ver}
 else
     echo "ERROR: No /boot/.uname found to extract 'uname -r' from."
 fi
diff --git a/uEnv.txt b/uEnv.txt
index b98cf94..a76693d 100644
--- a/uEnv.txt
+++ b/uEnv.txt
@@ -2,5 +2,4 @@ verbosity=1
 bootlogo=false
 overlay_prefix=rockchip-rk3588
 fdtfile=rockchip/rk3588s-orangepi-5.dtb
-rootdev=UUID=5fe11b68-cab3-4c7c-8382-ea27cb923344
 rootfstype=ext4