diff --git a/scripts/build-images b/scripts/build-images
index 6832bbf..85b527c 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -14,7 +14,14 @@ fi
 export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION | ${CMD} -d '\n')
 export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
 
-docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION} || {
+AGAMA_VERSION=${AGAMA_VERSION:-N/A}
+[[ "${AGAMA_VERSION}" == "N/A" ]] && {
+  TAG=${TAG:-build-$(date +%Y%m%d)}
+} || {
+  TAG=${TAG:-agama-${AGAMA_VERSION}}
+}
+
+docker build . -t ${CONTAINER}:${TAG} || {
 cat << EOM
 
 Building docker image failed.