diff --git a/build/build-docker-image.sh b/build/build-docker-image.sh
index 200b6c350a9d2b66ef6752b48fbc5fc1437ed570..fe94a347f10a2d2c1fb3d637f27223c116cb4dad 100755
--- a/build/build-docker-image.sh
+++ b/build/build-docker-image.sh
@@ -12,15 +12,19 @@ PUSH=false
 function usage() {
 	echo "$0 [-v <version>] [-p] [-h]"
 	echo "-v <version>  : Specify the version to build default: latest"
+	echo "-s <suffix>   : Specify a suffix to add to the version name <version>_<suffix>"
 	echo "-p            : Push the image to docker hub"
 	echo "-h            : display this help"
 }
 
-while getopts "v:ph" opt; do
+while getopts "v:phs:" opt; do
 	case $opt in
 	v)
 		VERSION=${OPTARG}
 		;;
+	s)
+		VERSION_SUFFIX=${OPTARG}
+		;;
 	p)
 		PUSH=true
 		;;
@@ -39,9 +43,14 @@ if [[ "${LOCAL_ARCH}" =~ "arm" ]]; then
 fi
 
 COMPLETE_IMAGE_NAME="${IMAGE}:${VERSION}-${IMAGE_ARCH}"
+if [ -n  "${VERSION_SUFFIX:-}" ]; then
+	COMPLETE_IMAGE_NAME="${COMPLETE_IMAGE_NAME}_${VERSION_SUFFIX}"
+fi
 
 pushd "${SCRIPT_DIR}/../cozystack" || exit
 
+echo "Preparing easy-cozy image version ${COMPLETE_IMAGE_NAME}"
+
 echo "Refreshing base image..."
 docker pull debian:stable-slim