diff --git a/scripts/image b/scripts/image
index f2a8740100..0fbdd55f70 100755
--- a/scripts/image
+++ b/scripts/image
@@ -95,13 +95,21 @@ if [ -n "${CUSTOM_VERSION}" ]; then
 fi
 
 LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
-TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
+if [ "${LIBREELEC_BUILD}" = "official" ]; then
+  TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
+else
+  TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_BUILD}-${LIBREELEC_VERSION}"
+fi
 
 if [ -n "${CUSTOM_IMAGE_NAME}" ]; then
   IMAGE_NAME="${CUSTOM_IMAGE_NAME}"
 else
   if [ "${DEVEL_VERSION}" = "devel" ]; then
-    IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}"
+    if [ -n "${BUILDER_NAME}" ]; then
+      IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${LIBREELEC_BUILD}-${OS_VERSION}-${LIBREELEC_VERSION}"
+    else
+      IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}"
+    fi
   else
     IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}"
   fi