diff --git a/README.md b/README.md
index a7e375c..cfb1f10 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,11 @@
 This is the external Buildroot repository used to build system images and
 updates for the MynaPlayer project.
 
+Important notes and changes
+--------
+
+* The naming scheme for the rauc bundle has been updated to rely on 'bundle-MynaPlayer' with a sufix based on the output of git describe.
+
 Building
 --------
 
diff --git a/board/myna-player-odyssey/scripts/rootfs_postimage.sh b/board/myna-player-odyssey/scripts/rootfs_postimage.sh
index ab994de..67a85e0 100755
--- a/board/myna-player-odyssey/scripts/rootfs_postimage.sh
+++ b/board/myna-player-odyssey/scripts/rootfs_postimage.sh
@@ -8,16 +8,14 @@
 mkfs.ext4 -F "${BINARIES_DIR}/rauc.ext4"
 
 # prepare for genimage
-
+cd "${BINARIES_DIR}"
 export GENIMAGE_TMP=${BR2_EXTERNAL_MynaPlayer_PATH}/board/myna-player-odyssey/utilities/genimage.tmp
 GENIMAGE_CFG="${BR2_EXTERNAL_MynaPlayer_PATH}/board/myna-player-odyssey/utilities/genimage.cfg"
-export GENIMAGE_DATE=$(date -Idate)
 export GENIMAGE_USER=$(whoami)
 export GENIMAGE_HOST=$(hostname)
-export GENIMAGE_BUILD_ID=$(uuidgen)
+export GENIMAGE_BUILD_ID=$(git describe --dirty --broken)
 
 envsubst \
-\$GENIMAGE_DATE,\
 \$GENIMAGE_USER,\
 \$GENIMAGE_HOST,\
 \$GENIMAGE_BUILD_ID \
diff --git a/board/myna-player-odyssey/utilities/genimage.tmp b/board/myna-player-odyssey/utilities/genimage.tmp
index 51a102e..4c883dc 100644
--- a/board/myna-player-odyssey/utilities/genimage.tmp
+++ b/board/myna-player-odyssey/utilities/genimage.tmp
@@ -1,5 +1,5 @@
 image MynaPlayer.img {
-	name = "MynaPlayer-${GENIMAGE_DATE}"
+	name = "MynaPlayer-${GENIMAGE_BUILD_ID}"
 	hdimage {
 		gpt = "true"
 	}
@@ -37,8 +37,8 @@
 	}
 }
 
-image bundle-MynaPlayer-${GENIMAGE_DATE}.${GENIMAGE_BUILD_ID}.raucb {
-	name = "bundle-MynaPlayer-${GENIMAGE_DATE}"
+image bundle-MynaPlayer.${GENIMAGE_BUILD_ID}.raucb {
+	name = "bundle-MynaPlayer-${GENIMAGE_BUILD_ID}"
 	rauc {
 		files = {
 			"rootfs.tar.xz"
@@ -49,9 +49,8 @@
 		manifest = 
 			"[update]
 			compatible=LuminaSensum MynaPlayer
-			version=${GENIMAGE_DATE}
-			build=${GENIMAGE_BUILD_ID}
-			description=RAUC bundle for LuminaSensum MynaPlayer version ${GENIMAGE_DATE}, built by ${GENIMAGE_USER}@${GENIMAGE_HOST}.
+			version=${GENIMAGE_BUILD_ID}
+			description=RAUC bundle for LuminaSensum MynaPlayer version ${GENIMAGE_BUILD_ID}, built by ${GENIMAGE_USER}@${GENIMAGE_HOST}.
 			[image.rootfs]
 			filename=rootfs.tar.xz"
 	}