diff --git a/scripts/image b/scripts/image
index 178d02c017..0b509efbf9 100755
--- a/scripts/image
+++ b/scripts/image
@@ -38,7 +38,8 @@ function do_mkimage() {
     KERNEL_NAME="$KERNEL_NAME" \
     TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
     RELEASE_DIR="$RELEASE_DIR" \
-    UUID_STORAGE="$(uuidgen)" \
+    UUID_SYSTEM="$UUID_SYSTEM" \
+    UUID_STORAGE="$UUID_STORAGE" \
     DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
     DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
     UBOOT_SYSTEM="$UBOOT_SYSTEM" \
@@ -311,6 +312,9 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
     fi
 
+    UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
+    UUID_STORAGE="$(uuidgen)"
+
     do_mkimage
   fi
 
diff --git a/scripts/image_st b/scripts/image_st
index 4f60e9bf28..4a0bebc988 100755
--- a/scripts/image_st
+++ b/scripts/image_st
@@ -41,7 +41,8 @@ function do_mkimage() {
     KERNEL_NAME="$KERNEL_NAME" \
     TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
     RELEASE_DIR="$RELEASE_DIR" \
-    UUID_STORAGE="$(uuidgen)" \
+    UUID_SYSTEM="$UUID_SYSTEM" \
+    UUID_STORAGE="$UUID_STORAGE" \
     DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
     DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
     UBOOT_SYSTEM="$UBOOT_SYSTEM" \
@@ -361,6 +362,9 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
     fi
 
+    UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
+    UUID_STORAGE="$(uuidgen)"
+
     do_mkimage
   fi
 
diff --git a/scripts/mkimage b/scripts/mkimage
index 908245f7fd..bd1410ec16 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -53,12 +53,6 @@ show_error() {
 
 trap cleanup SIGINT
 
-# generate volume id for fat partition
-UUID_1=$(date '+%d%m')
-UUID_2=$(date '+%M%S')
-FAT_SERIAL_NUMBER="${UUID_1}${UUID_2}"
-UUID_SYSTEM="${UUID_1}-${UUID_2}"
-
 # create an image
 echo -e "\nimage: creating file $(basename ${DISK})..."
 dd if=/dev/zero of="${DISK}" bs=1M count="${DISK_SIZE}" conv=fsync >"${SAVE_ERROR}" 2>&1 || show_error
@@ -113,7 +107,7 @@ alias mcopy="mcopy -i ${DISK}@@${OFFSET}"
 alias mmd="mmd -i ${DISK}@@${OFFSET}"
 
 if [ "${BOOTLOADER}" = "syslinux" -o "${BOOTLOADER}" = "bcm2835-bootloader" -o "${BOOTLOADER}" = "u-boot" ]; then
-  mformat -v "${DISTRO_BOOTLABEL}" -N "${FAT_SERIAL_NUMBER}" ::
+  mformat -v "${DISTRO_BOOTLABEL}" -N "${UUID_SYSTEM//-/}" ::
 fi
 sync