diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index 67e689aa66..cce1fa3d33 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -69,6 +69,20 @@ makeinstall_target() {
     # Always install the update script
     find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
 
+    # Replace partition names in update.sh
+    if [ -f "$INSTALL/usr/share/bootloader/update.sh" ] ; then
+      sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \
+          -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \
+          -i $INSTALL/usr/share/bootloader/update.sh
+    fi
+
+    # Replace labels in boot.ini
+    if [ -f "$INSTALL/usr/share/bootloader/boot.ini" ] ; then
+      sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \
+          -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \
+          -i $INSTALL/usr/share/bootloader/boot.ini
+    fi
+
     # Always install the canupdate script
     if find_file_path bootloader/canupdate.sh; then
       cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
index bd179b39d7..44e9b53865 100755
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@@ -44,10 +44,10 @@ for arg in $(cat /proc/cmdline); do
       boot="${arg#*=}"
       case $boot in
         /dev/mmc*)
-          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/fatlabel $boot "LIBREELEC"
+          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/fatlabel $boot "@BOOT_LABEL@"
           ;;
         LABEL=*)
-          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/fatlabel $($SYSTEM_ROOT/usr/sbin/findfs $boot) "LIBREELEC"
+          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/fatlabel $($SYSTEM_ROOT/usr/sbin/findfs $boot) "@BOOT_LABEL@"
           ;;
       esac
 
@@ -91,10 +91,10 @@ for arg in $(cat /proc/cmdline); do
       disk="${arg#*=}"
       case $disk in
         /dev/mmc*)
-          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/e2label $disk "STORAGE"
+          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/e2label $disk "@DISK_LABEL@"
           ;;
         LABEL=*)
-          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/e2label $($SYSTEM_ROOT/usr/sbin/findfs $disk) "STORAGE"
+          LD_LIBRARY_PATH="$SYSTEM_ROOT/lib" $SYSTEM_ROOT/usr/sbin/e2label $($SYSTEM_ROOT/usr/sbin/findfs $disk) "@DISK_LABEL@"
           ;;
       esac
       ;;
diff --git a/projects/Amlogic/devices/KVIM/bootloader/boot.ini b/projects/Amlogic/devices/KVIM/bootloader/boot.ini
index 43e173e4e2..a11d85d5da 100644
--- a/projects/Amlogic/devices/KVIM/bootloader/boot.ini
+++ b/projects/Amlogic/devices/KVIM/bootloader/boot.ini
@@ -8,7 +8,7 @@
 #------------------------------------------------------------------------------------------------------
 KHADAS-UBOOT-CONFIG
 
-setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE"
+setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=@BOOT_LABEL@ disk=LABEL=@DISK_LABEL@"
 setenv condev "ttyS0,115200"
 setenv hdmimode "1080p60hz"
 setenv hdmioutput   "1"
diff --git a/projects/Amlogic/devices/KVIM2/bootloader/boot.ini b/projects/Amlogic/devices/KVIM2/bootloader/boot.ini
index 43e173e4e2..a11d85d5da 100644
--- a/projects/Amlogic/devices/KVIM2/bootloader/boot.ini
+++ b/projects/Amlogic/devices/KVIM2/bootloader/boot.ini
@@ -8,7 +8,7 @@
 #------------------------------------------------------------------------------------------------------
 KHADAS-UBOOT-CONFIG
 
-setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE"
+setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=@BOOT_LABEL@ disk=LABEL=@DISK_LABEL@"
 setenv condev "ttyS0,115200"
 setenv hdmimode "1080p60hz"
 setenv hdmioutput   "1"
diff --git a/projects/Amlogic/devices/LePotato/bootloader/boot.ini b/projects/Amlogic/devices/LePotato/bootloader/boot.ini
index d27a75a60b..91c080a013 100644
--- a/projects/Amlogic/devices/LePotato/bootloader/boot.ini
+++ b/projects/Amlogic/devices/LePotato/bootloader/boot.ini
@@ -8,7 +8,7 @@
 #------------------------------------------------------------------------------------------------------
 LIBRETECH-UBOOT-CONFIG
 
-setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE"
+setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=@BOOT_LABEL@ disk=LABEL=@DISK_LABEL@"
 setenv condev "ttyS0,115200"
 setenv hdmimode "1080p60hz"
 setenv hdmioutput   "1"
diff --git a/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini b/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini
index 95db1970b1..a96615c33e 100644
--- a/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini
+++ b/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini
@@ -8,7 +8,7 @@
 #------------------------------------------------------------------------------------------------------
 ODROIDC2-UBOOT-CONFIG
 
-setenv bootrootfs "BOOT_IMAGE=KERNEL boot=LABEL=LIBREELEC disk=LABEL=STORAGE"
+setenv bootrootfs "BOOT_IMAGE=KERNEL boot=LABEL=@BOOT_LABEL@ disk=LABEL=@DISK_LABEL@"
 setenv condev "ttyS0,115200"
 setenv hdmimode "1080p60hz"
 setenv hdmioutput   "1"
diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk
index 5451747d14..0110fe4525 100644
--- a/projects/Amlogic/packages/u-boot/package.mk
+++ b/projects/Amlogic/packages/u-boot/package.mk
@@ -89,4 +89,18 @@ makeinstall_target() {
         cp -av $PKG_BUILD/fip/u-boot.bin.sd.bin $INSTALL/usr/share/bootloader/u-boot
         ;;
     esac
+
+    # Replace partition names in update.sh
+    if [ -f "$INSTALL/usr/share/bootloader/update.sh" ] ; then
+      sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \
+          -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \
+          -i $INSTALL/usr/share/bootloader/update.sh
+    fi
+
+    # Replace labels in boot.ini
+    if [ -f "$INSTALL/usr/share/bootloader/boot.ini" ] ; then
+      sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \
+          -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \
+          -i $INSTALL/usr/share/bootloader/boot.ini
+    fi
 }